diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-15 09:49:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-15 09:49:20 +0300 |
| commit | fa70c1462aabd3c3a052f6383fb8cef6120a34f3 (patch) | |
| tree | aa28da207de4cd034a897e66cc5ec9465cf12051 /storage/innobase/include/buf0buf.h | |
| parent | 308f8350c7baa189cff74c845875117c2fe9c044 (diff) | |
| download | mariadb-git-fa70c1462aabd3c3a052f6383fb8cef6120a34f3.tar.gz | |
MDEV-23399 preparation: Remove buf_pool.zip_clean
The debug data structure may have been useful during the development of
ROW_FORMAT=COMPRESSED page frames. Let us simplify code by removing it.
Diffstat (limited to 'storage/innobase/include/buf0buf.h')
| -rw-r--r-- | storage/innobase/include/buf0buf.h | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index 04d74b6e36f..3eb1773a5b6 100644 --- a/storage/innobase/include/buf0buf.h +++ b/storage/innobase/include/buf0buf.h @@ -818,15 +818,11 @@ public: state() == BUF_BLOCK_NOT_USED: buf_pool.free or buf_pool.withdraw - state() == BUF_BLOCK_FILE_PAGE || - (state() == BUF_BLOCK_ZIP_PAGE && !oldest_modification()): + in_file() && oldest_modification(): buf_pool.flush_list (protected by buf_pool.flush_list_mutex) - state() == BUF_BLOCK_ZIP_PAGE && !oldest_modification(): buf_pool.zip_clean - - The contents is undefined if - !oldest_modification() && state() == BUF_BLOCK_FILE_PAGE, - or if state() is not any of the above. */ + The contents is undefined if in_file() && !oldest_modification(), + or if state() is BUF_BLOCK_MEMORY or BUF_BLOCK_REMOVE_HASH. */ UT_LIST_NODE_T(buf_page_t) list; private: @@ -2024,22 +2020,11 @@ public: unzip_LRU list */ /* @} */ - /** @name Buddy allocator fields - The buddy allocator is used for allocating compressed page - frames and buf_page_t descriptors of blocks that exist - in the buffer pool only in compressed form. */ - /* @{ */ -#ifdef UNIV_DEBUG - /** unmodified ROW_FORMAT=COMPRESSED pages; - protected by buf_pool.mutex */ - UT_LIST_BASE_NODE_T(buf_page_t) zip_clean; -#endif /* UNIV_DEBUG */ - UT_LIST_BASE_NODE_T(buf_buddy_free_t) zip_free[BUF_BUDDY_SIZES_MAX]; - /*!< buddy free lists */ + /** free ROW_FORMAT=COMPRESSED page frames */ + UT_LIST_BASE_NODE_T(buf_buddy_free_t) zip_free[BUF_BUDDY_SIZES_MAX]; #if BUF_BUDDY_LOW > UNIV_ZIP_SIZE_MIN # error "BUF_BUDDY_LOW > UNIV_ZIP_SIZE_MIN" #endif - /* @} */ /** Sentinels to detect if pages are read into the buffer pool while a delete-buffering operation is pending. Protected by mutex. */ |