1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tc_remove_all_unused_tables() cleanup

Browse Source 
As tc_purge() never marks share flushed, let tdc_remove_table() do it
directly.

Part of MDEV-17882 - Cleanup refresh version
This commit is contained in:
Sergey Vojtovich 2019-12-18 15:02:55 +04:00
parent 14e1385691
commit 06fae75859
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sql/table_cache.cc
View File

@ -260,25 +260,12 @@ static void tc_remove_table(TABLE *table)
static void tc_remove_all_unused_tables(TDC_element *element, static void tc_remove_all_unused_tables(TDC_element *element,
Share_free_tables::List *purge_tables, Share_free_tables::List *purge_tables)
bool mark_flushed)
{ {
TABLE *table;
/*
Mark share flushed in order to ensure that it gets
automatically deleted once it is no longer referenced.
Note that code in TABLE_SHARE::wait_for_old_version() assumes that
marking share flushed is followed by purge of unused table
shares.
*/
if (mark_flushed)
element->flushed= true;
for (uint32 i= 0; i < tc_instances; i++) for (uint32 i= 0; i < tc_instances; i++)
{ {
mysql_mutex_lock(&tc[i].LOCK_table_cache); mysql_mutex_lock(&tc[i].LOCK_table_cache);
while ((table= element->free_tables[i].list.pop_front())) while (auto table= element->free_tables[i].list.pop_front())
{ {
tc[i].records--; tc[i].records--;
tc[i].free_tables.remove(table); tc[i].free_tables.remove(table);
@ -306,17 +293,11 @@ static void tc_remove_all_unused_tables(TDC_element *element,
periodicly flush all not used tables. periodicly flush all not used tables.
*/ */
struct tc_purge_arg static my_bool tc_purge_callback(TDC_element *element,
{ Share_free_tables::List *purge_tables)
Share_free_tables::List purge_tables;
bool mark_flushed;
};
static my_bool tc_purge_callback(TDC_element *element, tc_purge_arg *arg)
{ {
mysql_mutex_lock(&element->LOCK_table_share); mysql_mutex_lock(&element->LOCK_table_share);
tc_remove_all_unused_tables(element, &arg->purge_tables, arg->mark_flushed); tc_remove_all_unused_tables(element, purge_tables);
mysql_mutex_unlock(&element->LOCK_table_share); mysql_mutex_unlock(&element->LOCK_table_share);
return FALSE; return FALSE;
} }
@ -324,12 +305,10 @@ static my_bool tc_purge_callback(TDC_element *element, tc_purge_arg *arg)
void tc_purge() void tc_purge()
{ {
tc_purge_arg argument; Share_free_tables::List purge_tables;
TABLE *table;
argument.mark_flushed= false; tdc_iterate(0, (my_hash_walk_action) tc_purge_callback, &purge_tables);
tdc_iterate(0, (my_hash_walk_action) tc_purge_callback, &argument); while (auto table= purge_tables.pop_front())
while ((table= argument.purge_tables.pop_front()))
intern_close_table(table); intern_close_table(table);
} }
@ -1096,9 +1075,10 @@ bool tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
mysql_mutex_unlock(&LOCK_unused_shares); mysql_mutex_unlock(&LOCK_unused_shares);
element->ref_count++; element->ref_count++;
if (remove_type != TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE)
element->flushed= true;
tc_remove_all_unused_tables(element, &purge_tables, tc_remove_all_unused_tables(element, &purge_tables);
remove_type != TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE);
if (remove_type == TDC_RT_REMOVE_NOT_OWN || if (remove_type == TDC_RT_REMOVE_NOT_OWN ||
remove_type == TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE) remove_type == TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE)