mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#218 fix incorrect use of num_DBs_lock

Browse source
This commit is contained in:
Rich Prohaska 2014-04-29 13:51:05 -04:00
parent 94ed981ffe
commit 53cb5329e4
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
storage/tokudb/ha_tokudb.cc
View file

@ -3928,6 +3928,7 @@ int ha_tokudb::write_row(uchar * record) {
tokudb_trx_data *trx = NULL; tokudb_trx_data *trx = NULL;
uint curr_num_DBs; uint curr_num_DBs;
bool create_sub_trans = false; bool create_sub_trans = false;
bool num_DBs_locked = false;
// //
// some crap that needs to be done because MySQL does not properly abstract // some crap that needs to be done because MySQL does not properly abstract
@ -3975,6 +3976,7 @@ int ha_tokudb::write_row(uchar * record) {
// //
if (!num_DBs_locked_in_bulk) { if (!num_DBs_locked_in_bulk) {
rw_rdlock(&share->num_DBs_lock); rw_rdlock(&share->num_DBs_lock);
num_DBs_locked = true;
} }
else { else {
lock_count++; lock_count++;
@ -4065,7 +4067,7 @@ int ha_tokudb::write_row(uchar * record) {
track_progress(thd); track_progress(thd);
} }
cleanup: cleanup:
if (!num_DBs_locked_in_bulk) { if (num_DBs_locked) {
rw_unlock(&share->num_DBs_lock); rw_unlock(&share->num_DBs_lock);
} }
if (error == DB_KEYEXIST) { if (error == DB_KEYEXIST) {
@ -4156,7 +4158,11 @@ int ha_tokudb::update_row(const uchar * old_row, uchar * new_row) {
// //
// grab reader lock on numDBs_lock // grab reader lock on numDBs_lock
// //
rw_rdlock(&share->num_DBs_lock); bool num_DBs_locked = false;
if (!num_DBs_locked_in_bulk) {
rw_rdlock(&share->num_DBs_lock);
num_DBs_locked = true;
}
curr_num_DBs = share->num_DBs; curr_num_DBs = share->num_DBs;
if (using_ignore) { if (using_ignore) {
@ -4250,7 +4256,9 @@ int ha_tokudb::update_row(const uchar * old_row, uchar * new_row) {
cleanup: cleanup:
rw_unlock(&share->num_DBs_lock); if (num_DBs_locked) {
rw_unlock(&share->num_DBs_lock);
}
if (error == DB_KEYEXIST) { if (error == DB_KEYEXIST) {
error = HA_ERR_FOUND_DUPP_KEY; error = HA_ERR_FOUND_DUPP_KEY;
} }
@ -4290,7 +4298,11 @@ int ha_tokudb::delete_row(const uchar * record) {
// //
// grab reader lock on numDBs_lock // grab reader lock on numDBs_lock
// //
rw_rdlock(&share->num_DBs_lock); bool num_DBs_locked = false;
if (!num_DBs_locked_in_bulk) {
rw_rdlock(&share->num_DBs_lock);
num_DBs_locked = true;
}
curr_num_DBs = share->num_DBs; curr_num_DBs = share->num_DBs;
create_dbt_key_from_table(&prim_key, primary_key, key_buff, record, &has_null); create_dbt_key_from_table(&prim_key, primary_key, key_buff, record, &has_null);
@ -4325,7 +4337,9 @@ int ha_tokudb::delete_row(const uchar * record) {
track_progress(thd); track_progress(thd);
} }
cleanup: cleanup:
rw_unlock(&share->num_DBs_lock); if (num_DBs_locked) {
rw_unlock(&share->num_DBs_lock);
}
TOKUDB_HANDLER_DBUG_RETURN(error); TOKUDB_HANDLER_DBUG_RETURN(error);
} }
@ -6052,7 +6066,9 @@ int ha_tokudb::reset(void) {
// //
int ha_tokudb::acquire_table_lock (DB_TXN* trans, TABLE_LOCK_TYPE lt) { int ha_tokudb::acquire_table_lock (DB_TXN* trans, TABLE_LOCK_TYPE lt) {
int error = ENOSYS; int error = ENOSYS;
rw_rdlock(&share->num_DBs_lock); if (!num_DBs_locked_in_bulk) {
rw_rdlock(&share->num_DBs_lock);
}
uint curr_num_DBs = share->num_DBs; uint curr_num_DBs = share->num_DBs;
if (lt == lock_read) { if (lt == lock_read) {
error = 0; error = 0;
@ -6077,7 +6093,9 @@ int ha_tokudb::acquire_table_lock (DB_TXN* trans, TABLE_LOCK_TYPE lt) {
error = 0; error = 0;
cleanup: cleanup:
rw_unlock(&share->num_DBs_lock); if (!num_DBs_locked_in_bulk) {
rw_unlock(&share->num_DBs_lock);
}
return error; return error;
} }