database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

MDEV-20706: Add missing override qualifiers

Browse Source
This commit is contained in:
Marko Mäkelä
2019-10-04 10:39:24 +03:00
parent 57ce0bab32
commit 1950e32464
1 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
sql/sql_type.h
View File

@@ -4497,33 +4497,35 @@ public:
class Type_handler_decimal_result: public Type_handler_numeric class Type_handler_decimal_result: public Type_handler_numeric
{ {
public: public:
protocol_send_type_t protocol_send_type() const protocol_send_type_t protocol_send_type() const override
{ {
return PROTOCOL_SEND_STRING; return PROTOCOL_SEND_STRING;
} }
Item_result result_type() const { return DECIMAL_RESULT; } Item_result result_type() const override { return DECIMAL_RESULT; }
Item_result cmp_type() const { return DECIMAL_RESULT; } Item_result cmp_type() const override { return DECIMAL_RESULT; }
enum_dynamic_column_type dyncol_type(const Type_all_attributes *attr) const enum_dynamic_column_type dyncol_type(const Type_all_attributes *) const
override
{ {
return DYN_COL_DECIMAL; return DYN_COL_DECIMAL;
} }
virtual ~Type_handler_decimal_result() {}; virtual ~Type_handler_decimal_result() {};
const Type_handler *type_handler_for_comparison() const; const Type_handler *type_handler_for_comparison() const override;
int stored_field_cmp_to_item(THD *thd, Field *field, Item *item) const int stored_field_cmp_to_item(THD *, Field *field, Item *item) const override
{ {
VDec item_val(item); VDec item_val(item);
return item_val.is_null() ? 0 : my_decimal(field).cmp(item_val.ptr()); return item_val.is_null() ? 0 : my_decimal(field).cmp(item_val.ptr());
} }
bool subquery_type_allows_materialization(const Item *inner, bool subquery_type_allows_materialization(const Item *inner,
const Item *outer) const; const Item *outer) const override;
Field *make_schema_field(MEM_ROOT *root, Field *make_schema_field(MEM_ROOT *root,
TABLE *table, TABLE *table,
const Record_addr &addr, const Record_addr &addr,
const ST_FIELD_INFO &def, const ST_FIELD_INFO &def,
bool show_field) const; bool show_field) const override;
Field *make_num_distinct_aggregator_field(MEM_ROOT *, const Item *) const; Field *make_num_distinct_aggregator_field(MEM_ROOT *, const Item *)
const override;
void make_sort_key(uchar *to, Item *item, const SORT_FIELD_ATTR *sort_field, void make_sort_key(uchar *to, Item *item, const SORT_FIELD_ATTR *sort_field,
Sort_param *param) const; Sort_param *param) const override;
void void
Column_definition_attributes_frm_pack(const Column_definition_attributes *at, Column_definition_attributes_frm_pack(const Column_definition_attributes *at,
uchar *buff) const override; uchar *buff) const override;
@@ -4535,85 +4537,92 @@ public:
const override; const override;
void sortlength(THD *thd, void sortlength(THD *thd,
const Type_std_attributes *item, const Type_std_attributes *item,
SORT_FIELD_ATTR *attr) const; SORT_FIELD_ATTR *attr) const override;
uint32 max_display_length(const Item *item) const; uint32 max_display_length(const Item *item) const override;
Item *create_typecast_item(THD *thd, Item *item, Item *create_typecast_item(THD *thd, Item *item,
const Type_cast_attributes &attr) const; const Type_cast_attributes &attr) const override;
bool Item_const_eq(const Item_const *a, const Item_const *b, bool Item_const_eq(const Item_const *a, const Item_const *b,
bool binary_cmp) const; bool binary_cmp) const override;
bool Item_eq_value(THD *thd, const Type_cmp_attributes *attr, bool Item_eq_value(THD *thd, const Type_cmp_attributes *attr,
Item *a, Item *b) const Item *a, Item *b) const override
{ {
VDec va(a), vb(b); VDec va(a), vb(b);
return va.ptr() && vb.ptr() && !va.cmp(vb); return va.ptr() && vb.ptr() && !va.cmp(vb);
} }
uint Item_decimal_precision(const Item *item) const; uint Item_decimal_precision(const Item *item) const override;
bool Item_save_in_value(THD *thd, Item *item, st_value *value) const; bool Item_save_in_value(THD *thd, Item *item, st_value *value) const override;
void Item_param_set_param_func(Item_param *param, void Item_param_set_param_func(Item_param *param,
uchar **pos, ulong len) const; uchar **pos, ulong len) const override;
bool Item_param_set_from_value(THD *thd, bool Item_param_set_from_value(THD *thd,
Item_param *param, Item_param *param,
const Type_all_attributes *attr, const Type_all_attributes *attr,
const st_value *value) const; const st_value *value) const override;
bool Item_send(Item *item, Protocol *protocol, st_value *buf) const bool Item_send(Item *item, Protocol *protocol, st_value *buf) const override
{ {
return Item_send_str(item, protocol, buf); return Item_send_str(item, protocol, buf);
} }
void Item_update_null_value(Item *item) const; void Item_update_null_value(Item *item) const override;
int Item_save_in_field(Item *item, Field *field, bool no_conversions) const; int Item_save_in_field(Item *item, Field *field, bool no_conversions) const
Item *make_const_item_for_comparison(THD *, Item *src, const Item *cmp) const; override;
Item_cache *Item_get_cache(THD *thd, const Item *item) const; Item *make_const_item_for_comparison(THD *, Item *src, const Item *cmp) const
bool set_comparator_func(Arg_comparator *cmp) const; override;
Item_cache *Item_get_cache(THD *thd, const Item *item) const override;
bool set_comparator_func(Arg_comparator *cmp) const override;
bool Item_hybrid_func_fix_attributes(THD *thd, bool Item_hybrid_func_fix_attributes(THD *thd,
const char *name, const char *name,
Type_handler_hybrid_field_type *, Type_handler_hybrid_field_type *,
Type_all_attributes *atrr, Type_all_attributes *atrr,
Item **items, uint nitems) const; Item **items, uint nitems)
bool Item_sum_hybrid_fix_length_and_dec(Item_sum_hybrid *func) const; const override;
bool Item_sum_sum_fix_length_and_dec(Item_sum_sum *) const; bool Item_sum_hybrid_fix_length_and_dec(Item_sum_hybrid *) const override;
bool Item_sum_avg_fix_length_and_dec(Item_sum_avg *) const; bool Item_sum_sum_fix_length_and_dec(Item_sum_sum *) const override;
bool Item_sum_variance_fix_length_and_dec(Item_sum_variance *) const; bool Item_sum_avg_fix_length_and_dec(Item_sum_avg *) const override;
bool Item_val_bool(Item *item) const bool Item_sum_variance_fix_length_and_dec(Item_sum_variance*) const override;
bool Item_val_bool(Item *item) const override
{ {
return VDec(item).to_bool(); return VDec(item).to_bool();
} }
void Item_get_date(THD *thd, Item *item, Temporal::Warn *warn, void Item_get_date(THD *thd, Item *item, Temporal::Warn *warn,
MYSQL_TIME *ltime, date_mode_t fuzzydate) const; MYSQL_TIME *ltime, date_mode_t fuzzydate) const override;
longlong Item_val_int_signed_typecast(Item *item) const; longlong Item_val_int_signed_typecast(Item *item) const override;
longlong Item_val_int_unsigned_typecast(Item *item) const longlong Item_val_int_unsigned_typecast(Item *item) const override
{ {
return VDec(item).to_longlong(true); return VDec(item).to_longlong(true);
} }
String *Item_func_hex_val_str_ascii(Item_func_hex *item, String *str) const; String *Item_func_hex_val_str_ascii(Item_func_hex *item, String *str)
const override;
String *Item_func_hybrid_field_type_val_str(Item_func_hybrid_field_type *, String *Item_func_hybrid_field_type_val_str(Item_func_hybrid_field_type *,
String *) const; String *) const override;
double Item_func_hybrid_field_type_val_real(Item_func_hybrid_field_type *) double Item_func_hybrid_field_type_val_real(Item_func_hybrid_field_type *)
const; const override;
longlong Item_func_hybrid_field_type_val_int(Item_func_hybrid_field_type *) longlong Item_func_hybrid_field_type_val_int(Item_func_hybrid_field_type *)
const; const override;
my_decimal *Item_func_hybrid_field_type_val_decimal( my_decimal *Item_func_hybrid_field_type_val_decimal(
Item_func_hybrid_field_type *, Item_func_hybrid_field_type *,
my_decimal *) const; my_decimal *) const override;
void Item_func_hybrid_field_type_get_date(THD *, void Item_func_hybrid_field_type_get_date(THD *,
Item_func_hybrid_field_type *, Item_func_hybrid_field_type *,
Temporal::Warn *, Temporal::Warn *,
MYSQL_TIME *, MYSQL_TIME *,
date_mode_t fuzzydate) const; date_mode_t fuzzydate)
String *Item_func_min_max_val_str(Item_func_min_max *, String *) const; const override;
longlong Item_func_between_val_int(Item_func_between *func) const; String *Item_func_min_max_val_str(Item_func_min_max *, String *)
cmp_item *make_cmp_item(THD *thd, CHARSET_INFO *cs) const; const override;
in_vector *make_in_vector(THD *, const Item_func_in *, uint nargs) const; longlong Item_func_between_val_int(Item_func_between *func) const override;
bool Item_func_in_fix_comparator_compatible_types(THD *thd, cmp_item *make_cmp_item(THD *thd, CHARSET_INFO *cs) const override;
Item_func_in *) const; in_vector *make_in_vector(THD *, const Item_func_in *, uint nargs)
bool Item_func_round_fix_length_and_dec(Item_func_round *) const; const override;
bool Item_func_int_val_fix_length_and_dec(Item_func_int_val *) const; bool Item_func_in_fix_comparator_compatible_types(THD *thd, Item_func_in *)
bool Item_func_abs_fix_length_and_dec(Item_func_abs *) const; const override;
bool Item_func_neg_fix_length_and_dec(Item_func_neg *) const; bool Item_func_round_fix_length_and_dec(Item_func_round *) const override;
bool Item_func_plus_fix_length_and_dec(Item_func_plus *) const; bool Item_func_int_val_fix_length_and_dec(Item_func_int_val*) const override;
bool Item_func_minus_fix_length_and_dec(Item_func_minus *) const; bool Item_func_abs_fix_length_and_dec(Item_func_abs *) const override;
bool Item_func_mul_fix_length_and_dec(Item_func_mul *) const; bool Item_func_neg_fix_length_and_dec(Item_func_neg *) const override;
bool Item_func_div_fix_length_and_dec(Item_func_div *) const; bool Item_func_plus_fix_length_and_dec(Item_func_plus *) const override;
bool Item_func_mod_fix_length_and_dec(Item_func_mod *) const; bool Item_func_minus_fix_length_and_dec(Item_func_minus *) const override;
bool Item_func_mul_fix_length_and_dec(Item_func_mul *) const override;
bool Item_func_div_fix_length_and_dec(Item_func_div *) const override;
bool Item_func_mod_fix_length_and_dec(Item_func_mod *) const override;
}; };