1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +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:
Dave Gosselin
2024-06-12 09:46:26 -04:00
committed by Dave Gosselin
parent ab448d4b34
commit db0c28eff8
306 changed files with 8808 additions and 8781 deletions

View File

@ -161,21 +161,21 @@ class Explain_table_access;
class Explain_basic_join : public Explain_node
{
public:
enum explain_node_type get_type() { return EXPLAIN_BASIC_JOIN; }
enum explain_node_type get_type() override { return EXPLAIN_BASIC_JOIN; }
Explain_basic_join(MEM_ROOT *root) : Explain_node(root), join_tabs(NULL) {}
~Explain_basic_join();
bool add_table(Explain_table_access *tab, Explain_query *query);
int get_select_id() { return select_id; }
int get_select_id() override { return select_id; }
int select_id;
int print_explain(Explain_query *query, select_result_sink *output,
uint8 explain_flags, bool is_analyze);
uint8 explain_flags, bool is_analyze) override;
void print_explain_json(Explain_query *query, Json_writer *writer,
bool is_analyze);
bool is_analyze) override;
void print_explain_json_interns(Explain_query *query, Json_writer *writer,
bool is_analyze);
@ -205,7 +205,7 @@ class Explain_aggr_node;
class Explain_select : public Explain_basic_join
{
public:
enum explain_node_type get_type() { return EXPLAIN_SELECT; }
enum explain_node_type get_type() override { return EXPLAIN_SELECT; }
Explain_select(MEM_ROOT *root, bool is_analyze) :
Explain_basic_join(root),
@ -260,9 +260,9 @@ public:
Explain_aggr_node* aggr_tree;
int print_explain(Explain_query *query, select_result_sink *output,
uint8 explain_flags, bool is_analyze);
uint8 explain_flags, bool is_analyze) override;
void print_explain_json(Explain_query *query, Json_writer *writer,
bool is_analyze);
bool is_analyze) override;
Table_access_tracker *get_using_temporary_read_tracker()
{
@ -299,7 +299,7 @@ class Explain_aggr_filesort : public Explain_aggr_node
List<Item> sort_items;
List<ORDER::enum_order> sort_directions;
public:
enum_explain_aggr_node_type get_type() { return AGGR_OP_FILESORT; }
enum_explain_aggr_node_type get_type() override { return AGGR_OP_FILESORT; }
Filesort_tracker tracker;
Explain_aggr_filesort(MEM_ROOT *mem_root, bool is_analyze,
@ -311,20 +311,20 @@ public:
class Explain_aggr_tmp_table : public Explain_aggr_node
{
public:
enum_explain_aggr_node_type get_type() { return AGGR_OP_TEMP_TABLE; }
enum_explain_aggr_node_type get_type() override { return AGGR_OP_TEMP_TABLE; }
};
class Explain_aggr_remove_dups : public Explain_aggr_node
{
public:
enum_explain_aggr_node_type get_type() { return AGGR_OP_REMOVE_DUPLICATES; }
enum_explain_aggr_node_type get_type() override { return AGGR_OP_REMOVE_DUPLICATES; }
};
class Explain_aggr_window_funcs : public Explain_aggr_node
{
List<Explain_aggr_filesort> sorts;
public:
enum_explain_aggr_node_type get_type() { return AGGR_OP_WINDOW_FUNCS; }
enum_explain_aggr_node_type get_type() override { return AGGR_OP_WINDOW_FUNCS; }
void print_json_members(Json_writer *writer, bool is_analyze);
friend class Window_funcs_computation;
@ -351,10 +351,10 @@ public:
fake_select_lex_explain(root, is_analyze)
{}
enum explain_node_type get_type() { return EXPLAIN_UNION; }
enum explain_node_type get_type() override { return EXPLAIN_UNION; }
unit_common_op operation;
int get_select_id()
int get_select_id() override
{
DBUG_ASSERT(union_members.elements() > 0);
return union_members.at(0);
@ -377,9 +377,9 @@ public:
union_members.append(select_no);
}
int print_explain(Explain_query *query, select_result_sink *output,
uint8 explain_flags, bool is_analyze);
uint8 explain_flags, bool is_analyze) override;
void print_explain_json(Explain_query *query, Json_writer *writer,
bool is_analyze);
bool is_analyze) override;
const char *fake_select_type;
bool using_filesort;
@ -886,8 +886,8 @@ public:
command_tracker(is_analyze)
{}
virtual enum explain_node_type get_type() { return EXPLAIN_UPDATE; }
virtual int get_select_id() { return 1; /* always root */ }
enum explain_node_type get_type() override { return EXPLAIN_UPDATE; }
int get_select_id() override { return 1; /* always root */ }
const char *select_type;
@ -943,10 +943,10 @@ public:
/* TODO: This tracks time to read rows from the table */
Exec_time_tracker table_tracker;
virtual int print_explain(Explain_query *query, select_result_sink *output,
uint8 explain_flags, bool is_analyze);
virtual void print_explain_json(Explain_query *query, Json_writer *writer,
bool is_analyze);
int print_explain(Explain_query *query, select_result_sink *output,
uint8 explain_flags, bool is_analyze) override;
void print_explain_json(Explain_query *query, Json_writer *writer,
bool is_analyze) override;
};
@ -966,13 +966,13 @@ public:
StringBuffer<64> table_name;
enum explain_node_type get_type() { return EXPLAIN_INSERT; }
int get_select_id() { return 1; /* always root */ }
enum explain_node_type get_type() override { return EXPLAIN_INSERT; }
int get_select_id() override { return 1; /* always root */ }
int print_explain(Explain_query *query, select_result_sink *output,
uint8 explain_flags, bool is_analyze);
uint8 explain_flags, bool is_analyze) override;
void print_explain_json(Explain_query *query, Json_writer *writer,
bool is_analyze);
bool is_analyze) override;
};
@ -993,13 +993,13 @@ public:
*/
bool deleting_all_rows;
virtual enum explain_node_type get_type() { return EXPLAIN_DELETE; }
virtual int get_select_id() { return 1; /* always root */ }
enum explain_node_type get_type() override { return EXPLAIN_DELETE; }
int get_select_id() override { return 1; /* always root */ }
virtual int print_explain(Explain_query *query, select_result_sink *output,
uint8 explain_flags, bool is_analyze);
virtual void print_explain_json(Explain_query *query, Json_writer *writer,
bool is_analyze);
int print_explain(Explain_query *query, select_result_sink *output,
uint8 explain_flags, bool is_analyze) override;
void print_explain_json(Explain_query *query, Json_writer *writer,
bool is_analyze) override;
};