database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed FederatedX to follow THD ha_data protocol

Browse Source 
Use thd_get_ha_data()/thd_set_ha_data() which protect against plugin
removal until it has THD ha_data.

Do not reset THD ha_data in ha_federatedx::disconnect(), cleaner approach
is to let ha_close_connection() do it.

Part of MDEV-19515 - Improve connect speed
This commit is contained in:
Sergey Vojtovich
2019-05-16 14:19:05 +04:00
parent ce30c99478
commit 762d2b96fa
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.cc
View File

@ -2664,10 +2664,6 @@ double handler::keyread_time(uint index, uint ranges, ha_rows rows)
return cost; return cost;
} }
void **handler::ha_data(THD *thd) const
{
return thd_ha_data(thd, ht);
}
THD *handler::ha_thd(void) const THD *handler::ha_thd(void) const
{ {

1
sql/handler.h
View File

@ -4475,7 +4475,6 @@ public:
TABLE_SHARE* get_table_share() { return table_share; } TABLE_SHARE* get_table_share() { return table_share; }
protected: protected:
/* Service methods for use by storage engines. */ /* Service methods for use by storage engines. */
void **ha_data(THD *) const;
THD *ha_thd(void) const; THD *ha_thd(void) const;
/** /**

12
storage/federatedx/ha_federatedx.cc
View File

@ -1746,10 +1746,13 @@ ha_rows ha_federatedx::records_in_range(uint inx, key_range *start_key,
federatedx_txn *ha_federatedx::get_txn(THD *thd, bool no_create) federatedx_txn *ha_federatedx::get_txn(THD *thd, bool no_create)
{ {
federatedx_txn **txnp= (federatedx_txn **) ha_data(thd); federatedx_txn *txn= (federatedx_txn *) thd_get_ha_data(thd, federatedx_hton);
if (!*txnp && !no_create) if (!txn && !no_create)
*txnp= new federatedx_txn(); {
return *txnp; txn= new federatedx_txn();
thd_set_ha_data(thd, federatedx_hton, txn);
}
return txn;
} }
@ -1757,7 +1760,6 @@ int ha_federatedx::disconnect(handlerton *hton, MYSQL_THD thd)
{ {
federatedx_txn *txn= (federatedx_txn *) thd_get_ha_data(thd, hton); federatedx_txn *txn= (federatedx_txn *) thd_get_ha_data(thd, hton);
delete txn; delete txn;
*((federatedx_txn **) thd_ha_data(thd, hton))= 0;
return 0; return 0;
} }