mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: lock0lock.c: Minor cleanup.

Browse source 
Replace some while loops with do..while or for loops.

lock_move_rec_list_start(): Replace 2 with PAGE_HEAP_NO_USER_LOW.
This commit is contained in:
marko 2007-01-23 14:10:48 +00:00
parent 7ebd17e0e4
commit f0154795ad
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lock/lock0lock.c
View file

@ -1316,9 +1316,12 @@ lock_rec_get_first(
lock = lock_rec_get_first_on_page(block);
if (UNIV_LIKELY_NULL(lock)) {
while (lock && !lock_rec_get_nth_bit(lock, heap_no)) {
do {
if (lock_rec_get_nth_bit(lock, heap_no)) {
break;
}
lock = lock_rec_get_next_on_page(lock);
}
} while (lock);
}
return(lock);
@ -2740,9 +2743,8 @@ lock_move_rec_list_end(
table to the end of the hash chain, and lock_rec_add_to_queue
does not reuse locks if there are waiters in the queue. */
lock = lock_rec_get_first_on_page(block);
while (lock != NULL) {
for (lock = lock_rec_get_first_on_page(block); lock;
lock = lock_rec_get_next_on_page(lock)) {
page_cur_t cur1;
page_cur_t cur2;
const ulint type_mode = lock->type_mode;
@ -2798,8 +2800,6 @@ lock_move_rec_list_end(
page_cur_move_to_next(&cur1);
page_cur_move_to_next(&cur2);
}
lock = lock_rec_get_next_on_page(lock);
}
lock_mutex_exit_kernel();
@ -2838,9 +2838,8 @@ lock_move_rec_list_start(
lock_mutex_enter_kernel();
lock = lock_rec_get_first_on_page(block);
while (lock != NULL) {
for (lock = lock_rec_get_first_on_page(block); lock;
lock = lock_rec_get_next_on_page(lock)) {
page_cur_t cur1;
page_cur_t cur2;
const ulint type_mode = lock->type_mode;
@ -2899,7 +2898,8 @@ lock_move_rec_list_start(
if (page_rec_is_supremum(rec)) {
ulint i;
for (i = 2; i < lock_rec_get_n_bits(lock); i++) {
for (i = PAGE_HEAP_NO_USER_LOW;
i < lock_rec_get_n_bits(lock); i++) {
if (UNIV_UNLIKELY
(lock_rec_get_nth_bit(lock, i))) {
@ -2912,8 +2912,6 @@ lock_move_rec_list_start(
}
}
#endif /* UNIV_DEBUG */
lock = lock_rec_get_next_on_page(lock);
}
lock_mutex_exit_kernel();