mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 07:05:33 +02:00
Backport of:
------------------------------------------------------------ revno: 2617.68.24 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-next-bg-pre2-2 timestamp: Wed 2009-09-16 17:25:29 +0400 message: Pre-requisite patch for fixing bug #30977 "Concurrent statement using stored function and DROP FUNCTION breaks SBR". Added MDL_request for stored routine as member to Sroutine_hash_entry in order to be able perform metadata locking for stored routines in future (Sroutine_hash_entry is an equivalent of TABLE_LIST class for stored routines). (WL#4284, follow up fixes). sql/mdl.cc: Introduced version of MDL_request::init() method which initializes lock request using pre-built MDL key. MDL_key::table_name/table_name_length() getters were renamed to reflect the fact that MDL_key objects are now created not only for tables. sql/mdl.h: Extended enum_mdl_namespace enum with values which correspond to namespaces for stored functions and triggers. Renamed MDL_key::table_name/table_name_length() getters to MDL_key::name() and name_length() correspondingly to reflect the fact that MDL_key objects are now created not only for tables. Added MDL_key::mdl_namespace() getter. Also added version of MDL_request::init() method which initializes lock request using pre-built MDL key. sql/sp.cc: Added MDL_request for stored routine as member to Sroutine_hash_entry. Changed code to use MDL_key from this request as a key for LEX::sroutines set. Removed separate "key" member from Sroutine_hash_entry as it became unnecessary. sql/sp.h: Added MDL_request for stored routine as member to Sroutine_hash_entry in order to be able perform metadata locking for stored routines in future (Sroutine_hash_entry is an equivalent of TABLE_LIST class for stored routines). Removed Sroutine_hash_entry::key member as now we can use MDL_key from this request as a key for LEX::sroutines set. sql/sp_head.cc: Removed sp_name::m_sroutines_key member and set_routine_type() method. Since key for routine in LEX::sroutines set has no longer sp_name::m_qname as suffix we won't save anything by creating it at sp_name construction time. Adjusted sp_name constructor used for creating temporary objects for lookups in SP-cache to accept MDL_key as parameter and to avoid any memory allocation. Finally, removed sp_head::m_soutines_key member for reasons similar to why sp_name::m_sroutines_key was removed sql/sp_head.h: Removed sp_name::m_sroutines_key member and set_routine_type() method. Since key for routine in LEX::sroutines set has no longer sp_name::m_qname as suffix we won't save anything by creating it at sp_name construction time. Adjusted sp_name constructor used for creating temporary objects for lookups in SP-cache to accept MDL_key as parameter and to avoid any memory allocation. Finally, removed sp_head::m_soutines_key member for reasons similar to why sp_name::m_sroutines_key was removed. sql/sql_base.cc: Adjusted code to the fact that we now use MDL_key from Sroutine_hash_entry::mdl_request as a key for LEX::sroutines set. MDL_key::table_name/table_name_length() getters were renamed to reflect the fact that MDL_key objects are now created not only for tables. sql/sql_trigger.cc: sp_add_used_routine() now takes MDL_key as parameter as now we use instance of this class as a key for LEX::sroutines set.
This commit is contained in:
Konstantin Osipov
parent
b9d2f55a9d
commit
634a810942
8 changed files with 109 additions and 105 deletions
32
sql/sp.cc
32
sql/sp.cc
|
|
@ -1391,8 +1391,8 @@ extern "C" uchar* sp_sroutine_key(const uchar *ptr, size_t *plen,
|
|||
my_bool first)
|
||||
{
|
||||
Sroutine_hash_entry *rn= (Sroutine_hash_entry *)ptr;
|
||||
*plen= rn->key.length;
|
||||
return (uchar *)rn->key.str;
|
||||
*plen= rn->mdl_request.key.length();
|
||||
return (uchar *)rn->mdl_request.key.ptr();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1430,23 +1430,19 @@ extern "C" uchar* sp_sroutine_key(const uchar *ptr, size_t *plen,
|
|||
*/
|
||||
|
||||
bool sp_add_used_routine(Query_tables_list *prelocking_ctx, Query_arena *arena,
|
||||
const LEX_STRING *key, TABLE_LIST *belong_to_view)
|
||||
const MDL_key *key, TABLE_LIST *belong_to_view)
|
||||
{
|
||||
my_hash_init_opt(&prelocking_ctx->sroutines, system_charset_info,
|
||||
Query_tables_list::START_SROUTINES_HASH_SIZE,
|
||||
0, 0, sp_sroutine_key, 0, 0);
|
||||
|
||||
if (!my_hash_search(&prelocking_ctx->sroutines, (uchar *)key->str,
|
||||
key->length))
|
||||
if (!my_hash_search(&prelocking_ctx->sroutines, key->ptr(), key->length()))
|
||||
{
|
||||
Sroutine_hash_entry *rn=
|
||||
(Sroutine_hash_entry *)arena->alloc(sizeof(Sroutine_hash_entry) +
|
||||
key->length + 1);
|
||||
(Sroutine_hash_entry *)arena->alloc(sizeof(Sroutine_hash_entry));
|
||||
if (!rn) // OOM. Error will be reported using fatal_error().
|
||||
return FALSE;
|
||||
rn->key.length= key->length;
|
||||
rn->key.str= (char *)rn + sizeof(Sroutine_hash_entry);
|
||||
memcpy(rn->key.str, key->str, key->length + 1);
|
||||
rn->mdl_request.init(key, MDL_SHARED);
|
||||
my_hash_insert(&prelocking_ctx->sroutines, (uchar *)rn);
|
||||
prelocking_ctx->sroutines_list.link_in_list((uchar *)rn, (uchar **)&rn->next);
|
||||
rn->belong_to_view= belong_to_view;
|
||||
|
|
@ -1477,8 +1473,9 @@ bool sp_add_used_routine(Query_tables_list *prelocking_ctx, Query_arena *arena,
|
|||
void sp_add_used_routine(Query_tables_list *prelocking_ctx, Query_arena *arena,
|
||||
sp_name *rt, char rt_type)
|
||||
{
|
||||
rt->set_routine_type(rt_type);
|
||||
(void)sp_add_used_routine(prelocking_ctx, arena, &rt->m_sroutines_key, 0);
|
||||
MDL_key key((rt_type == TYPE_ENUM_FUNCTION) ? MDL_FUNCTION : MDL_PROCEDURE,
|
||||
rt->m_db.str, rt->m_name.str);
|
||||
(void)sp_add_used_routine(prelocking_ctx, arena, &key, 0);
|
||||
prelocking_ctx->sroutines_list_own_last= prelocking_ctx->sroutines_list.next;
|
||||
prelocking_ctx->sroutines_list_own_elements=
|
||||
prelocking_ctx->sroutines_list.elements;
|
||||
|
|
@ -1535,7 +1532,8 @@ void sp_update_sp_used_routines(HASH *dst, HASH *src)
|
|||
for (uint i=0 ; i < src->records ; i++)
|
||||
{
|
||||
Sroutine_hash_entry *rt= (Sroutine_hash_entry *)my_hash_element(src, i);
|
||||
if (!my_hash_search(dst, (uchar *)rt->key.str, rt->key.length))
|
||||
if (!my_hash_search(dst, (uchar *)rt->mdl_request.key.ptr(),
|
||||
rt->mdl_request.key.length()))
|
||||
my_hash_insert(dst, (uchar *)rt);
|
||||
}
|
||||
}
|
||||
|
|
@ -1562,8 +1560,8 @@ sp_update_stmt_used_routines(THD *thd, Query_tables_list *prelocking_ctx,
|
|||
for (uint i=0 ; i < src->records ; i++)
|
||||
{
|
||||
Sroutine_hash_entry *rt= (Sroutine_hash_entry *)my_hash_element(src, i);
|
||||
(void)sp_add_used_routine(prelocking_ctx, thd->stmt_arena, &rt->key,
|
||||
belong_to_view);
|
||||
(void)sp_add_used_routine(prelocking_ctx, thd->stmt_arena,
|
||||
&rt->mdl_request.key, belong_to_view);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1587,8 +1585,8 @@ void sp_update_stmt_used_routines(THD *thd, Query_tables_list *prelocking_ctx,
|
|||
{
|
||||
for (Sroutine_hash_entry *rt= (Sroutine_hash_entry *)src->first;
|
||||
rt; rt= rt->next)
|
||||
(void)sp_add_used_routine(prelocking_ctx, thd->stmt_arena, &rt->key,
|
||||
belong_to_view);
|
||||
(void)sp_add_used_routine(prelocking_ctx, thd->stmt_arena,
|
||||
&rt->mdl_request.key, belong_to_view);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue