mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 02:30:06 +01:00
A pre-requisite for WL#5419 "LOCK_open scalability:
make tdc_refresh_version an atomic counter". Backport the trivial changes from mysql-trunk-iplus.
This commit is contained in:
parent
df9ab0ffea
commit
41d95c5049
12 changed files with 16 additions and 23 deletions
|
@ -634,7 +634,6 @@ void *create_embedded_thd(int client_flag)
|
|||
thd->variables.option_bits |= OPTION_BIG_SELECTS;
|
||||
thd->proc_info=0; // Remove 'login'
|
||||
thd->command=COM_SLEEP;
|
||||
thd->version=refresh_version;
|
||||
thd->set_time();
|
||||
thd->init_for_queries();
|
||||
thd->client_capabilities= client_flag;
|
||||
|
|
|
@ -203,7 +203,6 @@ pre_init_event_thread(THD* thd)
|
|||
*/
|
||||
|
||||
thd->proc_info= "Initialized";
|
||||
thd->version= refresh_version;
|
||||
thd->set_time();
|
||||
|
||||
/* Do not use user-supplied timeout value for system threads. */
|
||||
|
|
|
@ -9510,7 +9510,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
|
|||
if (thd->store_globals())
|
||||
goto ndb_util_thread_fail;
|
||||
thd->init_for_queries();
|
||||
thd->version=refresh_version;
|
||||
thd->main_security_ctx.host_or_ip= "";
|
||||
thd->client_capabilities = 0;
|
||||
my_net_init(&thd->net, 0);
|
||||
|
|
|
@ -3678,7 +3678,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
|
|||
thd->init_for_queries();
|
||||
thd->command= COM_DAEMON;
|
||||
thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG;
|
||||
thd->version= refresh_version;
|
||||
thd->main_security_ctx.host_or_ip= "";
|
||||
thd->client_capabilities= 0;
|
||||
my_net_init(&thd->net, 0);
|
||||
|
@ -3965,9 +3964,9 @@ restart:
|
|||
!ndb_binlog_running))
|
||||
break; /* Shutting down server */
|
||||
|
||||
if (ndb_binlog_index && ndb_binlog_index->s->version < refresh_version)
|
||||
if (ndb_binlog_index && ndb_binlog_index->s->needs_reopen())
|
||||
{
|
||||
if (ndb_binlog_index->s->version < refresh_version)
|
||||
if (ndb_binlog_index->s->needs_reopen())
|
||||
{
|
||||
close_thread_tables(thd);
|
||||
ndb_binlog_index= 0;
|
||||
|
|
|
@ -2055,7 +2055,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
|
|||
thd_proc_info(thd, "Waiting for the next event in relay log");
|
||||
else
|
||||
thd_proc_info(thd, "Waiting for master update");
|
||||
thd->version=refresh_version;
|
||||
thd->set_time();
|
||||
/* Do not use user-supplied timeout value for system threads. */
|
||||
thd->variables.lock_wait_timeout= LONG_TIMEOUT;
|
||||
|
|
|
@ -440,7 +440,7 @@ static void table_def_unuse_table(TABLE *table)
|
|||
DBUG_ASSERT(table->in_use);
|
||||
|
||||
/* We shouldn't put the table to 'unused' list if the share is old. */
|
||||
DBUG_ASSERT(table->s->version == refresh_version);
|
||||
DBUG_ASSERT(! table->s->needs_reopen());
|
||||
|
||||
table->in_use= 0;
|
||||
/* Remove table from the list of tables used in this share. */
|
||||
|
@ -562,7 +562,9 @@ found:
|
|||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
if (!share->ref_count++ && share->prev)
|
||||
++share->ref_count;
|
||||
|
||||
if (share->ref_count == 1 && share->prev)
|
||||
{
|
||||
/*
|
||||
Share was not used before and it was in the old_unused_share list
|
||||
|
@ -700,8 +702,7 @@ void release_table_share(TABLE_SHARE *share)
|
|||
DBUG_ASSERT(share->ref_count);
|
||||
if (!--share->ref_count)
|
||||
{
|
||||
if (share->version != refresh_version ||
|
||||
table_def_shutdown_in_progress)
|
||||
if (share->needs_reopen() || table_def_shutdown_in_progress)
|
||||
my_hash_delete(&table_def_cache, (uchar*) share);
|
||||
else
|
||||
{
|
||||
|
@ -836,7 +837,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild)
|
|||
I_P_List_iterator<TABLE, TABLE_share> it(share->used_tables);
|
||||
while (it++)
|
||||
++(*start_list)->in_use;
|
||||
(*start_list)->locked= (share->version == 0) ? 1 : 0;
|
||||
(*start_list)->locked= 0; /* Obsolete. */
|
||||
start_list= &(*start_list)->next;
|
||||
*start_list=0;
|
||||
}
|
||||
|
@ -1071,7 +1072,7 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables, bool have_lock,
|
|||
{
|
||||
TABLE_SHARE *share=(TABLE_SHARE*) my_hash_element(&table_def_cache,
|
||||
idx);
|
||||
if (share->version != refresh_version)
|
||||
if (share->needs_reopen())
|
||||
{
|
||||
found= TRUE;
|
||||
break;
|
||||
|
@ -1083,7 +1084,7 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables, bool have_lock,
|
|||
for (TABLE_LIST *table= tables; table; table= table->next_local)
|
||||
{
|
||||
TABLE_SHARE *share= get_cached_table_share(table->db, table->table_name);
|
||||
if (share && share->version != refresh_version)
|
||||
if (share && share->needs_reopen())
|
||||
{
|
||||
found= TRUE;
|
||||
break;
|
||||
|
@ -2979,7 +2980,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
|
|||
}
|
||||
#endif
|
||||
|
||||
if (share->version != refresh_version)
|
||||
if (share->needs_reopen())
|
||||
{
|
||||
if (!(flags & MYSQL_OPEN_IGNORE_FLUSH))
|
||||
{
|
||||
|
@ -8608,7 +8609,7 @@ my_bool mysql_rm_tmp_tables(void)
|
|||
all not used tables.
|
||||
*/
|
||||
|
||||
void flush_tables()
|
||||
void tdc_flush_unused_tables()
|
||||
{
|
||||
mysql_mutex_lock(&LOCK_open);
|
||||
while (unused_tables)
|
||||
|
@ -8820,7 +8821,7 @@ tdc_wait_for_old_versions(THD *thd, MDL_request_list *mdl_requests,
|
|||
|
||||
if ((share= get_cached_table_share(mdl_request->key.db_name(),
|
||||
mdl_request->key.name())) &&
|
||||
share->version != refresh_version)
|
||||
share->needs_reopen())
|
||||
break;
|
||||
}
|
||||
if (!mdl_request)
|
||||
|
|
|
@ -233,7 +233,6 @@ bool rename_temporary_table(THD* thd, TABLE *table, const char *new_db,
|
|||
const char *table_name);
|
||||
void mysql_wait_completed_table(ALTER_PARTITION_PARAM_TYPE *lpt, TABLE *my_table);
|
||||
void remove_db_from_cache(const char *db);
|
||||
void flush_tables();
|
||||
bool is_equal(const LEX_STRING *a, const LEX_STRING *b);
|
||||
|
||||
/* Functions to work with system tables. */
|
||||
|
@ -263,6 +262,7 @@ void tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
|
|||
bool tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias,
|
||||
char *cache_key, uint cache_key_length,
|
||||
MEM_ROOT *mem_root, uint flags);
|
||||
void tdc_flush_unused_tables();
|
||||
TABLE *find_table_for_mdl_upgrade(TABLE *list, const char *db,
|
||||
const char *table_name,
|
||||
bool no_error);
|
||||
|
|
|
@ -1083,7 +1083,6 @@ static void prepare_new_connection_state(THD* thd)
|
|||
embedded server library.
|
||||
TODO: refactor this to avoid code duplication there
|
||||
*/
|
||||
thd->version= refresh_version;
|
||||
thd->proc_info= 0;
|
||||
thd->command= COM_SLEEP;
|
||||
thd->set_time();
|
||||
|
|
|
@ -1814,7 +1814,6 @@ public:
|
|||
thd.security_ctx->user=thd.security_ctx->priv_user=(char*) delayed_user;
|
||||
thd.security_ctx->host=(char*) my_localhost;
|
||||
thd.current_tablenr=0;
|
||||
thd.version=refresh_version;
|
||||
thd.command=COM_DELAYED_INSERT;
|
||||
thd.lex->current_select= 0; // for my_message_sql
|
||||
thd.lex->sql_command= SQLCOM_INSERT; // For innodb::store_lock()
|
||||
|
|
|
@ -108,7 +108,7 @@ pthread_handler_t handle_manager(void *arg __attribute__((unused)))
|
|||
|
||||
if (error == ETIMEDOUT || error == ETIME)
|
||||
{
|
||||
flush_tables();
|
||||
tdc_flush_unused_tables();
|
||||
error = 0;
|
||||
reset_flush_time = TRUE;
|
||||
}
|
||||
|
|
|
@ -497,7 +497,6 @@ static void handle_bootstrap_impl(THD *thd)
|
|||
#endif /* EMBEDDED_LIBRARY */
|
||||
|
||||
thd_proc_info(thd, 0);
|
||||
thd->version=refresh_version;
|
||||
thd->security_ctx->priv_user=
|
||||
thd->security_ctx->user= (char*) my_strdup("boot", MYF(MY_WME));
|
||||
thd->security_ctx->priv_host[0]=0;
|
||||
|
|
|
@ -740,7 +740,7 @@ struct TABLE_SHARE
|
|||
/*
|
||||
Must all TABLEs be reopened?
|
||||
*/
|
||||
inline bool needs_reopen()
|
||||
inline bool needs_reopen() const
|
||||
{
|
||||
return version != refresh_version;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue