diff options
Diffstat (limited to 'storage/maria/ha_maria.h')
| -rw-r--r-- | storage/maria/ha_maria.h | 151 |
1 files changed, 78 insertions, 73 deletions
diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index ddf8fc6f229..83f5a059a41 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.h @@ -39,6 +39,11 @@ C_MODE_END extern TYPELIB maria_recover_typelib; extern ulonglong maria_recover_options; +/* + In the ha_maria class there are a few virtual methods that are not marked as + 'final'. This is because they are re-defined by the ha_s3 engine. +*/ + class __attribute__((visibility("default"))) ha_maria :public handler { public: @@ -61,98 +66,98 @@ public: ha_maria(handlerton *hton, TABLE_SHARE * table_arg); ~ha_maria() {} handler *clone(const char *name, MEM_ROOT *mem_root); - const char *index_type(uint key_number); - ulonglong table_flags() const + const char *index_type(uint key_number) override final; + ulonglong table_flags() const override final { return int_table_flags; } - ulong index_flags(uint inx, uint part, bool all_parts) const; - uint max_supported_keys() const + ulong index_flags(uint inx, uint part, bool all_parts) const override final; + uint max_supported_keys() const override final { return MARIA_MAX_KEY; } - uint max_supported_key_length() const; - uint max_supported_key_part_length() const + uint max_supported_key_length() const override final; + uint max_supported_key_part_length() const override final { return max_supported_key_length(); } - enum row_type get_row_type() const; - void change_table_ptr(TABLE *table_arg, TABLE_SHARE *share); - virtual double scan_time(); - - int open(const char *name, int mode, uint test_if_locked); - int close(void); - int write_row(const uchar * buf); - int update_row(const uchar * old_data, const uchar * new_data); - int delete_row(const uchar * buf); + enum row_type get_row_type() const override final; + void change_table_ptr(TABLE *table_arg, TABLE_SHARE *share) override final; + virtual double scan_time() override final; + + int open(const char *name, int mode, uint test_if_locked) override; + int close(void) override final; + 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; int index_read_map(uchar * buf, const uchar * key, key_part_map keypart_map, - enum ha_rkey_function find_flag); + enum ha_rkey_function find_flag) override final; int index_read_idx_map(uchar * buf, uint idx, const uchar * key, key_part_map keypart_map, - enum ha_rkey_function find_flag); + enum ha_rkey_function find_flag) override final; int index_read_last_map(uchar * buf, const uchar * key, - key_part_map keypart_map); - int index_next(uchar * buf); - int index_prev(uchar * buf); - int index_first(uchar * buf); - int index_last(uchar * buf); - int index_next_same(uchar * buf, const uchar * key, uint keylen); - int ft_init() + key_part_map keypart_map) override final; + int index_next(uchar * buf) override final; + int index_prev(uchar * buf) override final; + int index_first(uchar * buf) override final; + int index_last(uchar * buf) override final; + int index_next_same(uchar * buf, const uchar * key, uint keylen) override final; + int ft_init() override final { if (!ft_handler) return 1; ft_handler->please->reinit_search(ft_handler); return 0; } - FT_INFO *ft_init_ext(uint flags, uint inx, String * key); - int ft_read(uchar * buf); - int index_init(uint idx, bool sorted); - int index_end(); - int rnd_init(bool scan); - int rnd_end(void); - int rnd_next(uchar * buf); - int rnd_pos(uchar * buf, uchar * pos); - int remember_rnd_pos(); - int restart_rnd_next(uchar * buf); - void position(const uchar * record); - int info(uint); + FT_INFO *ft_init_ext(uint flags, uint inx, String * key) override final; + int ft_read(uchar * buf) override final; + int index_init(uint idx, bool sorted) override final; + int index_end() override final; + int rnd_init(bool scan) override final; + int rnd_end(void) override final; + int rnd_next(uchar * buf) override final; + int rnd_pos(uchar * buf, uchar * pos) override final; + int remember_rnd_pos() override final; + int restart_rnd_next(uchar * buf) override final; + void position(const uchar * record) override final; + int info(uint) override final; int info(uint, my_bool); - int extra(enum ha_extra_function operation); - int extra_opt(enum ha_extra_function operation, ulong cache_size); - int reset(void); - int external_lock(THD * thd, int lock_type); - int start_stmt(THD *thd, thr_lock_type lock_type); - int delete_all_rows(void); - int disable_indexes(uint mode); - int enable_indexes(uint mode); - int indexes_are_disabled(void); - void start_bulk_insert(ha_rows rows, uint flags); - int end_bulk_insert(); + int extra(enum ha_extra_function operation) override final; + int extra_opt(enum ha_extra_function operation, ulong cache_size) override final; + int reset(void) override final; + int external_lock(THD * thd, int lock_type) override; + int start_stmt(THD *thd, thr_lock_type lock_type) override final; + int delete_all_rows(void) override final; + int disable_indexes(uint mode) override final; + int enable_indexes(uint mode) override final; + int indexes_are_disabled(void) override final; + void start_bulk_insert(ha_rows rows, uint flags) override final; + int end_bulk_insert() override final; ha_rows records_in_range(uint inx, const key_range *min_key, const key_range *max_key, - page_range *pages); - void update_create_info(HA_CREATE_INFO * create_info); - int create(const char *name, TABLE * form, HA_CREATE_INFO * create_info); + page_range *pages) override final; + void update_create_info(HA_CREATE_INFO * create_info) override final; + int create(const char *name, TABLE * form, HA_CREATE_INFO * create_info) override; THR_LOCK_DATA **store_lock(THD * thd, THR_LOCK_DATA ** to, - enum thr_lock_type lock_type); + enum thr_lock_type lock_type) override final; virtual void get_auto_increment(ulonglong offset, ulonglong increment, ulonglong nb_desired_values, ulonglong *first_value, - ulonglong *nb_reserved_values); - int rename_table(const char *from, const char *to); - int delete_table(const char *name); - void drop_table(const char *name); - int check(THD * thd, HA_CHECK_OPT * check_opt); - int analyze(THD * thd, HA_CHECK_OPT * check_opt); - int repair(THD * thd, HA_CHECK_OPT * check_opt); - bool check_and_repair(THD * thd); - bool is_crashed() const; + ulonglong *nb_reserved_values) override final; + int rename_table(const char *from, const char *to) override; + int delete_table(const char *name) override; + void drop_table(const char *name) override; + int check(THD * thd, HA_CHECK_OPT * check_opt) override; + int analyze(THD * thd, HA_CHECK_OPT * check_opt) override; + int repair(THD * thd, HA_CHECK_OPT * check_opt) override; + bool check_and_repair(THD * thd) override final; + bool is_crashed() const override final; bool is_changed() const; - bool auto_repair(int error) const; - int optimize(THD * thd, HA_CHECK_OPT * check_opt); - int assign_to_keycache(THD * thd, HA_CHECK_OPT * check_opt); - int preload_keys(THD * thd, HA_CHECK_OPT * check_opt); - bool check_if_incompatible_data(HA_CREATE_INFO * info, uint table_changes); + bool auto_repair(int error) const override final; + int optimize(THD * thd, HA_CHECK_OPT * check_opt) override final; + int assign_to_keycache(THD * thd, HA_CHECK_OPT * check_opt) override final; + int preload_keys(THD * thd, HA_CHECK_OPT * check_opt) override; + bool check_if_incompatible_data(HA_CREATE_INFO * info, uint table_changes) override final; #ifdef HAVE_QUERY_CACHE my_bool register_query_cache_table(THD *thd, const char *table_key, uint key_length, qc_engine_callback *engine_callback, - ulonglong *engine_data); + ulonglong *engine_data) override final; #endif MARIA_HA *file_ptr(void) { @@ -164,21 +169,21 @@ public: * Multi Range Read interface */ int multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param, - uint n_ranges, uint mode, HANDLER_BUFFER *buf); - int multi_range_read_next(range_id_t *range_info); + uint n_ranges, uint mode, HANDLER_BUFFER *buf) override final; + int multi_range_read_next(range_id_t *range_info) override final; ha_rows multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges, uint *bufsz, - uint *flags, Cost_estimate *cost); + uint *flags, Cost_estimate *cost) override final; ha_rows multi_range_read_info(uint keyno, uint n_ranges, uint keys, uint key_parts, uint *bufsz, - uint *flags, Cost_estimate *cost); - int multi_range_read_explain_info(uint mrr_mode, char *str, size_t size); + uint *flags, Cost_estimate *cost) override final; + int multi_range_read_explain_info(uint mrr_mode, char *str, size_t size) override final; /* Index condition pushdown implementation */ - Item *idx_cond_push(uint keyno, Item* idx_cond); + Item *idx_cond_push(uint keyno, Item* idx_cond) override final; - int find_unique_row(uchar *record, uint unique_idx); + int find_unique_row(uchar *record, uint unique_idx) override final; /* Following functions are needed by the S3 handler */ virtual S3_INFO *s3_open_args() { return 0; } |