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

MDEV-22640 fixup: clang -Winconsistent-missing-override

Browse Source
This commit is contained in:
Marko Mäkelä
2021-06-29 15:02:10 +03:00
parent 98c7916f0f
commit 3d15e3c085
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
sql/item_jsonfunc.h
View File

@@ -1,7 +1,7 @@
#ifndef ITEM_JSONFUNC_INCLUDED #ifndef ITEM_JSONFUNC_INCLUDED
#define ITEM_JSONFUNC_INCLUDED #define ITEM_JSONFUNC_INCLUDED
/* Copyright (c) 2016, MariaDB /* Copyright (c) 2016, 2021, MariaDB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -123,8 +123,8 @@ public:
:Item_str_func(thd, a, b) { } :Item_str_func(thd, a, b) { }
Item_json_func(THD *thd, List<Item> &list) Item_json_func(THD *thd, List<Item> &list)
:Item_str_func(thd, list) { } :Item_str_func(thd, list) { }
bool is_json_type() { return true; } bool is_json_type() override { return true; }
void make_send_field(THD *thd, Send_field *tmp_field) void make_send_field(THD *thd, Send_field *tmp_field) override
{ {
Item_str_func::make_send_field(thd, tmp_field); Item_str_func::make_send_field(thd, tmp_field);
static const Lex_cstring fmt(STRING_WITH_LEN("json")); static const Lex_cstring fmt(STRING_WITH_LEN("json"));
@@ -544,12 +544,12 @@ protected:
Overrides Item_func_group_concat::skip_nulls() Overrides Item_func_group_concat::skip_nulls()
NULL-s should be added to the result as JSON null value. NULL-s should be added to the result as JSON null value.
*/ */
bool skip_nulls() const { return false; } bool skip_nulls() const override { return false; }
String *get_str_from_item(Item *i, String *tmp); String *get_str_from_item(Item *i, String *tmp) override;
String *get_str_from_field(Item *i, Field *f, String *tmp, String *get_str_from_field(Item *i, Field *f, String *tmp,
const uchar *key, size_t offset); const uchar *key, size_t offset) override;
void cut_max_length(String *result, void cut_max_length(String *result,
uint old_length, uint max_length) const; uint old_length, uint max_length) const override;
public: public:
String m_tmp_json; /* Used in get_str_from_*.. */ String m_tmp_json; /* Used in get_str_from_*.. */
Item_func_json_arrayagg(THD *thd, Name_resolution_context *context_arg, Item_func_json_arrayagg(THD *thd, Name_resolution_context *context_arg,
@@ -562,10 +562,10 @@ public:
} }
Item_func_json_arrayagg(THD *thd, Item_func_json_arrayagg *item) : Item_func_json_arrayagg(THD *thd, Item_func_json_arrayagg *item) :
Item_func_group_concat(thd, item) {} Item_func_group_concat(thd, item) {}
bool is_json_type() { return true; } bool is_json_type() override { return true; }
const char *func_name() const { return "json_arrayagg("; } const char *func_name() const override { return "json_arrayagg("; }
enum Sumfunctype sum_func() const {return JSON_ARRAYAGG_FUNC;} enum Sumfunctype sum_func() const override { return JSON_ARRAYAGG_FUNC; }
String* val_str(String *str) override; String* val_str(String *str) override;
@@ -587,40 +587,38 @@ public:
} }
Item_func_json_objectagg(THD *thd, Item_func_json_objectagg *item); Item_func_json_objectagg(THD *thd, Item_func_json_objectagg *item);
bool is_json_type() { return true; } bool is_json_type() override { return true; }
void cleanup(); void cleanup() override;
enum Sumfunctype sum_func () const {return JSON_OBJECTAGG_FUNC;} enum Sumfunctype sum_func() const override {return JSON_OBJECTAGG_FUNC;}
const char *func_name() const { return "json_objectagg"; } const char *func_name() const override { return "json_objectagg"; }
const Type_handler *type_handler() const const Type_handler *type_handler() const override
{ {
if (too_big_for_varchar()) if (too_big_for_varchar())
return &type_handler_blob; return &type_handler_blob;
return &type_handler_varchar; return &type_handler_varchar;
} }
void clear(); void clear() override;
bool add(); bool add() override;
void reset_field() { DBUG_ASSERT(0); } // not used void reset_field() override { DBUG_ASSERT(0); } // not used
void update_field() { DBUG_ASSERT(0); } // not used void update_field() override { DBUG_ASSERT(0); } // not used
bool fix_fields(THD *,Item **); bool fix_fields(THD *,Item **) override;
double val_real() double val_real() override { return 0.0; }
{ return 0.0; } longlong val_int() override { return 0; }
longlong val_int() my_decimal *val_decimal(my_decimal *decimal_value) override
{ return 0; }
my_decimal *val_decimal(my_decimal *decimal_value)
{ {
my_decimal_set_zero(decimal_value); my_decimal_set_zero(decimal_value);
return decimal_value; return decimal_value;
} }
bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) override
{ {
return get_date_from_string(thd, ltime, fuzzydate); return get_date_from_string(thd, ltime, fuzzydate);
} }
String* val_str(String* str); String* val_str(String* str) override;
Item *copy_or_same(THD* thd); Item *copy_or_same(THD* thd) override;
void no_rows_in_result() {} void no_rows_in_result() override {}
Item *get_copy(THD *thd) Item *get_copy(THD *thd) override
{ return get_item_copy<Item_func_json_objectagg>(thd, this); } { return get_item_copy<Item_func_json_objectagg>(thd, this); }
}; };