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-12772 Add Field::get_typelib() and Item::get_typelib()

Browse Source
This commit is contained in:
Alexander Barkov
2017-05-10 11:02:02 +04:00
parent 0f642188cc
commit 191638416b
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.h
View File

@@ -1289,6 +1289,7 @@ public:
uint fill_cache_field(struct st_cache_field *copy); uint fill_cache_field(struct st_cache_field *copy);
virtual bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); virtual bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate);
bool get_time(MYSQL_TIME *ltime) { return get_date(ltime, TIME_TIME_ONLY); } bool get_time(MYSQL_TIME *ltime) { return get_date(ltime, TIME_TIME_ONLY); }
virtual TYPELIB *get_typelib() const { return NULL; }
virtual CHARSET_INFO *charset(void) const { return &my_charset_bin; } virtual CHARSET_INFO *charset(void) const { return &my_charset_bin; }
virtual CHARSET_INFO *charset_for_protocol(void) const virtual CHARSET_INFO *charset_for_protocol(void) const
{ return binary() ? &my_charset_bin : charset(); } { return binary() ? &my_charset_bin : charset(); }
@@ -3547,6 +3548,7 @@ public:
/* enum and set are sorted as integers */ /* enum and set are sorted as integers */
CHARSET_INFO *sort_charset(void) const { return &my_charset_bin; } CHARSET_INFO *sort_charset(void) const { return &my_charset_bin; }
uint decimals() const { return 0; } uint decimals() const { return 0; }
TYPELIB *get_typelib() const { return typelib; }
virtual uchar *pack(uchar *to, const uchar *from, uint max_length); virtual uchar *pack(uchar *to, const uchar *from, uint max_length);
virtual const uchar *unpack(uchar *to, const uchar *from, virtual const uchar *unpack(uchar *to, const uchar *from,

15
sql/item.cc
View File

@@ -9986,21 +9986,14 @@ void Item_type_holder::get_full_info(Item *item)
if (Item_type_holder::real_type_handler() == &type_handler_enum || if (Item_type_holder::real_type_handler() == &type_handler_enum ||
Item_type_holder::real_type_handler() == &type_handler_set) Item_type_holder::real_type_handler() == &type_handler_set)
{ {
if (item->type() == Item::SUM_FUNC_ITEM && TYPELIB *item_typelib= item->get_typelib();
(((Item_sum*)item)->sum_func() == Item_sum::MAX_FUNC ||
((Item_sum*)item)->sum_func() == Item_sum::MIN_FUNC))
item = ((Item_sum*)item)->get_arg(0);
/* /*
We can have enum/set type after merging only if we have one enum|set We can have enum/set type after merging only if we have one enum|set
field (or MIN|MAX(enum|set field)) and number of NULL fields field (or MIN|MAX(enum|set field)) and number of NULL fields
*/ */
DBUG_ASSERT((enum_set_typelib && DBUG_ASSERT(item->real_type_handler() == &type_handler_null ||
item->real_type_handler() == &type_handler_null) || (enum_set_typelib && !item_typelib) ||
(!enum_set_typelib && (!enum_set_typelib && item_typelib));
item->real_item()->type() == Item::FIELD_ITEM &&
(item->real_type_handler() == &type_handler_enum ||
item->real_type_handler() == &type_handler_set) &&
((Field_enum*)((Item_field *) item->real_item())->field)->typelib));
if (!enum_set_typelib) if (!enum_set_typelib)
{ {
enum_set_typelib= ((Field_enum*)((Item_field *) item->real_item())->field)->typelib; enum_set_typelib= ((Field_enum*)((Item_field *) item->real_item())->field)->typelib;

7
sql/item.h
View File

@@ -787,6 +787,7 @@ public:
{ {
return type_handler()->max_display_length(this); return type_handler()->max_display_length(this);
} }
virtual TYPELIB *get_typelib() const { return NULL; }
Item_cache* get_cache(THD *thd) const Item_cache* get_cache(THD *thd) const
{ {
return type_handler()->Item_get_cache(thd, this); return type_handler()->Item_get_cache(thd, this);
@@ -2682,6 +2683,7 @@ public:
return &type_handler_null; return &type_handler_null;
return field->type_handler(); return field->type_handler();
} }
TYPELIB *get_typelib() const { return field->get_typelib(); }
enum_monotonicity_info get_monotonicity_info() const enum_monotonicity_info get_monotonicity_info() const
{ {
return MONOTONIC_STRICT_INCREASING; return MONOTONIC_STRICT_INCREASING;
@@ -4321,6 +4323,11 @@ public:
{ {
return ref ? (*ref)->real_item() : this; return ref ? (*ref)->real_item() : this;
} }
TYPELIB *get_typelib() const
{
return ref ? (*ref)->get_typelib() : NULL;
}
bool walk(Item_processor processor, bool walk_subquery, void *arg) bool walk(Item_processor processor, bool walk_subquery, void *arg)
{ {
if (ref && *ref) if (ref && *ref)

1
sql/item_sum.h
View File

@@ -1044,6 +1044,7 @@ protected:
} }
const Type_handler *type_handler() const const Type_handler *type_handler() const
{ return Type_handler_hybrid_field_type::type_handler(); } { return Type_handler_hybrid_field_type::type_handler(); }
TYPELIB *get_typelib() const { return args[0]->get_typelib(); }
void update_field(); void update_field();
void min_max_update_str_field(); void min_max_update_str_field();
void min_max_update_real_field(); void min_max_update_real_field();