Commit 59a30d07 authored by kent@mysql.com's avatar kent@mysql.com

btr0sea.c:

  Added BTR_CHUNK_SIZE, removed 'chunk_size' declared after declaration block
parent 46d0edb8
...@@ -59,6 +59,9 @@ before hash index building is started */ ...@@ -59,6 +59,9 @@ before hash index building is started */
#define BTR_SEARCH_BUILD_LIMIT 100 #define BTR_SEARCH_BUILD_LIMIT 100
/* How many cells to check before temporarily releasing btr_search_latch */
#define BTR_CHUNK_SIZE 10000
/************************************************************************ /************************************************************************
Builds a hash index on a page with the given parameters. If the page already Builds a hash index on a page with the given parameters. If the page already
has a hash index with different parameters, the old hash index is removed. has a hash index with different parameters, the old hash index is removed.
...@@ -1606,10 +1609,6 @@ btr_search_validate(void) ...@@ -1606,10 +1609,6 @@ btr_search_validate(void)
ulint* offsets = offsets_; ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_; *offsets_ = (sizeof offsets_) / sizeof *offsets_;
/* How many cells to check before temporarily releasing
btr_search_latch. */
ulint chunk_size = 10000;
rw_lock_x_lock(&btr_search_latch); rw_lock_x_lock(&btr_search_latch);
cell_count = hash_get_n_cells(btr_search_sys->hash_index); cell_count = hash_get_n_cells(btr_search_sys->hash_index);
...@@ -1617,7 +1616,7 @@ btr_search_validate(void) ...@@ -1617,7 +1616,7 @@ btr_search_validate(void)
for (i = 0; i < cell_count; i++) { for (i = 0; i < cell_count; i++) {
/* We release btr_search_latch every once in a while to /* We release btr_search_latch every once in a while to
give other queries a chance to run. */ give other queries a chance to run. */
if ((i != 0) && ((i % chunk_size) == 0)) { if ((i != 0) && ((i % BTR_CHUNK_SIZE) == 0)) {
rw_lock_x_unlock(&btr_search_latch); rw_lock_x_unlock(&btr_search_latch);
os_thread_yield(); os_thread_yield();
rw_lock_x_lock(&btr_search_latch); rw_lock_x_lock(&btr_search_latch);
...@@ -1676,8 +1675,8 @@ btr_search_validate(void) ...@@ -1676,8 +1675,8 @@ btr_search_validate(void)
} }
} }
for (i = 0; i < cell_count; i += chunk_size) { for (i = 0; i < cell_count; i += BTR_CHUNK_SIZE) {
ulint end_index = ut_min(i + chunk_size - 1, cell_count - 1); ulint end_index = ut_min(i + BTR_CHUNK_SIZE - 1, cell_count - 1);
/* We release btr_search_latch every once in a while to /* We release btr_search_latch every once in a while to
give other queries a chance to run. */ give other queries a chance to run. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment