From cbf4fef47c7da077565dee13349d6ad5217726eb Mon Sep 17 00:00:00 2001 From: Aleksei Antipovskii Date: Wed, 25 Sep 2024 00:42:20 +0200 Subject: [PATCH] more overrides --- dbcon/mysql/ha_mcs_datatype.h | 4 ++-- dbcon/mysql/ha_mcs_impl_if.h | 17 +++++++++-------- dbcon/mysql/ha_mcs_pushdown.h | 6 +++--- dbcon/mysql/ha_mcs_sysvars.h | 12 ++++++------ dbcon/mysql/ha_subquery.h | 4 ++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dbcon/mysql/ha_mcs_datatype.h b/dbcon/mysql/ha_mcs_datatype.h index 3e588d86c..71e03c72d 100644 --- a/dbcon/mysql/ha_mcs_datatype.h +++ b/dbcon/mysql/ha_mcs_datatype.h @@ -113,7 +113,7 @@ class StoreFieldMariaDB : public StoreField return m_field->store(static_cast(val), 1); } - int store_float(float dl) + int store_float(float dl) override { if (dl == std::numeric_limits::infinity()) { @@ -128,7 +128,7 @@ class StoreFieldMariaDB : public StoreField return m_field->store(dl); } - int store_double(double dl) + int store_double(double dl) override { if (dl == std::numeric_limits::infinity()) { diff --git a/dbcon/mysql/ha_mcs_impl_if.h b/dbcon/mysql/ha_mcs_impl_if.h index 2de8797d6..4ffecba92 100644 --- a/dbcon/mysql/ha_mcs_impl_if.h +++ b/dbcon/mysql/ha_mcs_impl_if.h @@ -203,7 +203,7 @@ struct gp_walk_info , condPush(false) , dropCond(false) , internalDecimalScale(4) - , thd(0) + , thd(nullptr) , subSelectType(uint64_t(-1)) , subQuery(nullptr) , clauseType(INIT) @@ -250,7 +250,8 @@ struct cal_table_info FROM_FILE }; - cal_table_info() : tpl_ctx(0), c(0), msTablePtr(0), conn_hndl(0), condInfo(0), moreRows(false) + cal_table_info() + : tpl_ctx(nullptr), c(0), msTablePtr(nullptr), conn_hndl(nullptr), condInfo(nullptr), moreRows(false) { } sm::sp_cpsm_tplh_t tpl_ctx; @@ -268,12 +269,12 @@ struct cal_table_info struct cal_group_info { cal_group_info() - : groupByFields(0) - , groupByTables(0) - , groupByWhere(0) - , groupByGroup(0) - , groupByOrder(0) - , groupByHaving(0) + : groupByFields(nullptr) + , groupByTables(nullptr) + , groupByWhere(nullptr) + , groupByGroup(nullptr) + , groupByOrder(nullptr) + , groupByHaving(nullptr) , groupByDistinct(false) { } diff --git a/dbcon/mysql/ha_mcs_pushdown.h b/dbcon/mysql/ha_mcs_pushdown.h index 47bd8a578..f1c7253c9 100644 --- a/dbcon/mysql/ha_mcs_pushdown.h +++ b/dbcon/mysql/ha_mcs_pushdown.h @@ -81,7 +81,7 @@ class ha_mcs_group_by_handler : public group_by_handler public: ha_mcs_group_by_handler(THD* thd_arg, Query* query); - ~ha_mcs_group_by_handler(); + ~ha_mcs_group_by_handler() override; int init_scan() override; int next_row() override; int end_scan() override; @@ -116,7 +116,7 @@ class ha_columnstore_derived_handler : public derived_handler public: ha_columnstore_derived_handler(THD* thd_arg, TABLE_LIST* tbl); - ~ha_columnstore_derived_handler(); + ~ha_columnstore_derived_handler() override; int init_scan() override; int next_row() override; int end_scan() override; @@ -154,7 +154,7 @@ class ha_columnstore_select_handler : public select_handler ha_columnstore_select_handler(THD* thd_arg, SELECT_LEX* sel_lex); ha_columnstore_select_handler(THD* thd_arg, SELECT_LEX_UNIT* sel_unit); ha_columnstore_select_handler(THD* thd_arg, SELECT_LEX* sel_lex, SELECT_LEX_UNIT* sel_unit); - ~ha_columnstore_select_handler(); + ~ha_columnstore_select_handler() override; int init_scan() override; int next_row() override; int end_scan() override; diff --git a/dbcon/mysql/ha_mcs_sysvars.h b/dbcon/mysql/ha_mcs_sysvars.h index e05272742..f31dfd69c 100644 --- a/dbcon/mysql/ha_mcs_sysvars.h +++ b/dbcon/mysql/ha_mcs_sysvars.h @@ -60,14 +60,14 @@ void set_original_query(THD* thd, char* query); mcs_compression_type_t get_compression_type(THD* thd); void set_compression_type(THD* thd, ulong value); -void* get_fe_conn_info_ptr(THD* thd = NULL); -void set_fe_conn_info_ptr(void* ptr, THD* thd = NULL); +void* get_fe_conn_info_ptr(THD* thd = nullptr); +void set_fe_conn_info_ptr(void* ptr, THD* thd = nullptr); -ulonglong get_original_optimizer_flags(THD* thd = NULL); -void set_original_optimizer_flags(ulonglong ptr, THD* thd = NULL); +ulonglong get_original_optimizer_flags(THD* thd = nullptr); +void set_original_optimizer_flags(ulonglong ptr, THD* thd = nullptr); -ulonglong get_original_option_bits(THD* thd = NULL); -void set_original_option_bits(ulonglong value, THD* thd = NULL); +ulonglong get_original_option_bits(THD* thd = nullptr); +void set_original_option_bits(ulonglong value, THD* thd = nullptr); mcs_select_handler_mode_t get_select_handler_mode(THD* thd); void set_select_handler_mode(THD* thd, ulong value); diff --git a/dbcon/mysql/ha_subquery.h b/dbcon/mysql/ha_subquery.h index 31e6c29d9..688c64771 100644 --- a/dbcon/mysql/ha_subquery.h +++ b/dbcon/mysql/ha_subquery.h @@ -96,7 +96,7 @@ struct SubQueryChainHolder class WhereSubQuery : public SubQuery { public: - WhereSubQuery(gp_walk_info& gwip) : SubQuery(gwip), fSub(NULL), fFunc(NULL) + WhereSubQuery(gp_walk_info& gwip) : SubQuery(gwip), fSub(nullptr), fFunc(nullptr) { } WhereSubQuery(gp_walk_info& gwip, const execplan::SRCP& column, Item_subselect* sub, Item_func* func) @@ -175,7 +175,7 @@ class InSub : public WhereSubQuery InSub(const InSub& rhs); ~InSub() override; execplan::ParseTree* transform() override; - void handleFunc(gp_walk_info* gwip, Item_func* func); + void handleFunc(gp_walk_info* gwip, Item_func* func) override; void handleNot() override; };