Skip to content

Commit

Permalink
Merge 10.5 into 10.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@dr-m
dr-m committed Jul 3, 2021
2 parents 9ec3cd9 + f0f47cb commit b797f21
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 115 deletions.
90 changes: 2 additions & 88 deletions storage/innobase/buf/buf0buf.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1296,13 +1296,6 @@ void buf_pool_t::close()
ut_free(chunks);
chunks= nullptr;
page_hash.free();
while (page_hash_table *old_page_hash= freed_page_hash)
{
freed_page_hash= static_cast<page_hash_table*>
(old_page_hash->array[1].node);
old_page_hash->free();
UT_DELETE(old_page_hash);
}
zip_hash.free();

io_buf.close();
Expand Down Expand Up @@ -1581,57 +1574,6 @@ inline bool buf_pool_t::withdraw_blocks()
return(false);
}

/** resize page_hash and zip_hash */
inline void buf_pool_t::resize_hash()
{
page_hash_table *new_page_hash= UT_NEW_NOKEY(page_hash_table());
new_page_hash->create(2 * buf_pool.curr_size);
new_page_hash->write_lock_all();

for (auto i= page_hash.pad(page_hash.n_cells); i--; )
{
static_assert(!((page_hash_table::ELEMENTS_PER_LATCH + 1) &
page_hash_table::ELEMENTS_PER_LATCH),
"must be one less than a power of 2");
if (!(i & page_hash_table::ELEMENTS_PER_LATCH))
{
ut_ad(reinterpret_cast<page_hash_latch*>
(&page_hash.array[i])->is_write_locked());
continue;
}
while (buf_page_t *bpage= static_cast<buf_page_t*>
(page_hash.array[i].node))
{
ut_ad(bpage->in_page_hash);
const ulint fold= bpage->id().fold();
HASH_DELETE(buf_page_t, hash, &buf_pool.page_hash, fold, bpage);
HASH_INSERT(buf_page_t, hash, new_page_hash, fold, bpage);
}
}

buf_pool.page_hash.array[1].node= freed_page_hash;
std::swap(buf_pool.page_hash, *new_page_hash);
freed_page_hash= new_page_hash;

/* recreate zip_hash */
hash_table_t new_hash;
new_hash.create(2 * buf_pool.curr_size);

for (ulint i= 0; i < buf_pool.zip_hash.n_cells; i++)
{
while (buf_page_t *bpage= static_cast<buf_page_t*>
(HASH_GET_FIRST(&buf_pool.zip_hash, i)))
{
const ulint fold= BUF_POOL_ZIP_FOLD_BPAGE(bpage);
HASH_DELETE(buf_page_t, hash, &buf_pool.zip_hash, fold, bpage);
HASH_INSERT(buf_page_t, hash, &new_hash, fold, bpage);
}
}

std::swap(buf_pool.zip_hash.array, new_hash.array);
buf_pool.zip_hash.n_cells= new_hash.n_cells;
new_hash.free();
}


inline void buf_pool_t::page_hash_table::write_lock_all()
Expand All @@ -1656,26 +1598,6 @@ inline void buf_pool_t::page_hash_table::write_unlock_all()
}


inline void buf_pool_t::write_lock_all_page_hash()
{
mysql_mutex_assert_owner(&mutex);
page_hash.write_lock_all();
for (page_hash_table *old_page_hash= freed_page_hash; old_page_hash;
old_page_hash= static_cast<page_hash_table*>
(old_page_hash->array[1].node))
old_page_hash->write_lock_all();
}


inline void buf_pool_t::write_unlock_all_page_hash()
{
page_hash.write_unlock_all();
for (page_hash_table *old_page_hash= freed_page_hash; old_page_hash;
old_page_hash= static_cast<page_hash_table*>
(old_page_hash->array[1].node))
old_page_hash->write_unlock_all();
}

namespace
{

Expand Down Expand Up @@ -1848,7 +1770,7 @@ inline void buf_pool_t::resize()
resizing.store(true, std::memory_order_relaxed);

mysql_mutex_lock(&mutex);
write_lock_all_page_hash();
page_hash.write_lock_all();

chunk_t::map_reg = UT_NEW_NOKEY(chunk_t::map());

Expand Down Expand Up @@ -2004,16 +1926,8 @@ inline void buf_pool_t::resize()
= srv_buf_pool_base_size > srv_buf_pool_size * 2
|| srv_buf_pool_base_size * 2 < srv_buf_pool_size;

/* Normalize page_hash and zip_hash,
if the new size is too different */
if (!warning && new_size_too_diff) {
buf_resize_status("Resizing hash table");
resize_hash();
ib::info() << "hash tables were resized";
}

mysql_mutex_unlock(&mutex);
write_unlock_all_page_hash();
page_hash.write_unlock_all();

UT_DELETE(chunk_map_old);

Expand Down
4 changes: 2 additions & 2 deletions storage/innobase/buf/buf0flu.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ buf_flush_relocate_on_flush_list(
/* FIXME: Can we avoid holding buf_pool.mutex here? */
ut_ad(dpage->oldest_modification() == lsn);

if (const lsn_t o_lsn = bpage->oldest_modification()) {
if (ut_d(const lsn_t o_lsn =) bpage->oldest_modification()) {
ut_ad(o_lsn == lsn);

/* Important that we adjust the hazard pointer before removing
Expand All @@ -324,7 +324,7 @@ buf_flush_relocate_on_flush_list(
}

if (lsn == 1) {
buf_pool.stat.flush_list_bytes -= bpage->physical_size();
buf_pool.stat.flush_list_bytes -= dpage->physical_size();
was_clean:
dpage->list.prev = nullptr;
dpage->list.next = nullptr;
Expand Down
29 changes: 4 additions & 25 deletions storage/innobase/include/buf0buf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1795,22 +1795,14 @@ class buf_pool_t
page_hash_latch *lock_get(ulint fold) const
{ return lock_get(fold, n_cells); }

/** Acquire an array latch, tolerating concurrent buf_pool_t::resize()
/** Acquire an array latch.
@tparam exclusive whether the latch is to be acquired exclusively
@param fold hash bucket key */
template<bool exclusive> page_hash_latch *lock(ulint fold)
{
for (;;)
{
auto n= n_cells;
page_hash_latch *latch= lock_get(fold, n);
latch->acquire<exclusive>();
/* Our latch prevents n_cells from changing. */
if (UNIV_LIKELY(n == n_cells))
return latch;
/* Retry, because buf_pool_t::resize_hash() affected us. */
latch->release<exclusive>();
}
page_hash_latch *latch= lock_get(fold, n_cells);
latch->acquire<exclusive>();
return latch;
}

/** Exclusively aqcuire all latches */
Expand All @@ -1820,19 +1812,6 @@ class buf_pool_t
inline void write_unlock_all();
};

private:
/** Former page_hash that has been deleted during resize();
singly-linked list via freed_page_hash->array[1] */
page_hash_table *freed_page_hash;

/** Lock all page_hash, also freed_page_hash. */
inline void write_lock_all_page_hash();
/** Release all page_hash, also freed_page_hash. */
inline void write_unlock_all_page_hash();
/** Resize page_hash and zip_hash. */
inline void resize_hash();

public:
/** Hash table of file pages (buf_page_t::in_file() holds),
indexed by page_id_t. Protected by both mutex and page_hash.lock_get(). */
page_hash_table page_hash;
Expand Down

0 comments on commit b797f21

Please sign in to comment.