From 0ebe38a1c07bd1dc706a4ca31a717da1dad800d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 14 Dec 2017 12:58:23 +0200 Subject: [PATCH 3/6] Do not break locks in TRUNCATE TABLE lock_remove_all_on_table(): Remove. --- storage/innobase/include/lock0lock.h | 12 ---- storage/innobase/lock/lock0lock.cc | 107 ----------------------------------- storage/innobase/row/row0mysql.cc | 3 - storage/innobase/row/row0trunc.cc | 2 - 4 files changed, 124 deletions(-) diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index 06600960c27..125301e00f5 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -511,18 +511,6 @@ void lock_trx_release_locks( /*===================*/ trx_t* trx); /*!< in/out: transaction */ -/*********************************************************************//** -Removes locks on a table to be dropped or truncated. -If remove_also_table_sx_locks is TRUE then table-level S and X locks are -also removed in addition to other table-level and record-level locks. -No lock, that is going to be removed, is allowed to be a wait lock. */ -void -lock_remove_all_on_table( -/*=====================*/ - dict_table_t* table, /*!< in: table to be dropped - or truncated */ - ibool remove_also_table_sx_locks);/*!< in: also removes - table S and X locks */ /*********************************************************************//** Calculates the fold value of a page file address: used in inserting or diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 2f66e178daf..d098f6ac0f0 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -5378,113 +5378,6 @@ lock_trx_table_locks_remove( ut_error; } -/*********************************************************************//** -Removes locks of a transaction on a table to be dropped. -If remove_also_table_sx_locks is TRUE then table-level S and X locks are -also removed in addition to other table-level and record-level locks. -No lock that is going to be removed is allowed to be a wait lock. */ -static -void -lock_remove_all_on_table_for_trx( -/*=============================*/ - dict_table_t* table, /*!< in: table to be dropped */ - trx_t* trx, /*!< in: a transaction */ - ibool remove_also_table_sx_locks)/*!< in: also removes - table S and X locks */ -{ - lock_t* lock; - lock_t* prev_lock; - - ut_ad(lock_mutex_own()); - - for (lock = UT_LIST_GET_LAST(trx->lock.trx_locks); - lock != NULL; - lock = prev_lock) { - - prev_lock = UT_LIST_GET_PREV(trx_locks, lock); - - if (lock_get_type_low(lock) == LOCK_REC - && lock->index->table == table) { - ut_a(!lock_get_wait(lock)); - - lock_rec_discard(lock); - } else if (lock_get_type_low(lock) & LOCK_TABLE - && lock->un_member.tab_lock.table == table - && (remove_also_table_sx_locks - || !IS_LOCK_S_OR_X(lock))) { - - ut_a(!lock_get_wait(lock)); - - lock_trx_table_locks_remove(lock); - lock_table_remove_low(lock); - } - } -} - -/*********************************************************************//** -Removes locks on a table to be dropped or truncated. -If remove_also_table_sx_locks is TRUE then table-level S and X locks are -also removed in addition to other table-level and record-level locks. -No lock, that is going to be removed, is allowed to be a wait lock. */ -void -lock_remove_all_on_table( -/*=====================*/ - dict_table_t* table, /*!< in: table to be dropped - or truncated */ - ibool remove_also_table_sx_locks)/*!< in: also removes - table S and X locks */ -{ - lock_t* lock; - - lock_mutex_enter(); - - for (lock = UT_LIST_GET_FIRST(table->locks); - lock != NULL; - /* No op */) { - - lock_t* prev_lock; - - prev_lock = UT_LIST_GET_PREV(un_member.tab_lock.locks, lock); - - /* If we should remove all locks (remove_also_table_sx_locks - is TRUE), or if the lock is not table-level S or X lock, - then check we are not going to remove a wait lock. */ - if (remove_also_table_sx_locks - || !(lock_get_type(lock) == LOCK_TABLE - && IS_LOCK_S_OR_X(lock))) { - - ut_a(!lock_get_wait(lock)); - } - - lock_remove_all_on_table_for_trx( - table, lock->trx, remove_also_table_sx_locks); - - if (prev_lock == NULL) { - if (lock == UT_LIST_GET_FIRST(table->locks)) { - /* lock was not removed, pick its successor */ - lock = UT_LIST_GET_NEXT( - un_member.tab_lock.locks, lock); - } else { - /* lock was removed, pick the first one */ - lock = UT_LIST_GET_FIRST(table->locks); - } - } else if (UT_LIST_GET_NEXT(un_member.tab_lock.locks, - prev_lock) != lock) { - /* If lock was removed by - lock_remove_all_on_table_for_trx() then pick the - successor of prev_lock ... */ - lock = UT_LIST_GET_NEXT( - un_member.tab_lock.locks, prev_lock); - } else { - /* ... otherwise pick the successor of lock. */ - lock = UT_LIST_GET_NEXT( - un_member.tab_lock.locks, lock); - } - } - - lock_mutex_exit(); -} - /*===================== VALIDATION AND DEBUGGING ====================*/ /** Print info of a table lock. diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index dc911d2f535..7582f3afb18 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -2999,9 +2999,6 @@ row_mysql_table_id_reassign( dict_hdr_get_new_id(new_id, NULL, NULL, table, false); - /* Remove all locks except the table-level S and X locks. */ - lock_remove_all_on_table(table, FALSE); - pars_info_add_ull_literal(info, "old_id", table->id); pars_info_add_ull_literal(info, "new_id", *new_id); diff --git a/storage/innobase/row/row0trunc.cc b/storage/innobase/row/row0trunc.cc index d10e848e7de..e3e8d2c974d 100644 --- a/storage/innobase/row/row0trunc.cc +++ b/storage/innobase/row/row0trunc.cc @@ -1828,8 +1828,6 @@ row_truncate_table_for_mysql( table, trx, fsp_flags, logger, err)); } - /* Remove all locks except the table-level X lock. */ - lock_remove_all_on_table(table, FALSE); trx->table_id = table->id; trx_set_dict_operation(trx, TRX_DICT_OP_TABLE); -- 2.15.1