diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 08:54:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 08:54:33 +0300 |
| commit | b9f177f66ae89d38dc635d2eb35e5db3522cb0c3 (patch) | |
| tree | 9c121e6ec2f76823b1bee7d5438d4cc5957246f8 | |
| parent | 1cccd3c7cc1a5a973e03f9dd8dc457bce554d7a9 (diff) | |
| download | mariadb-git-b9f177f66ae89d38dc635d2eb35e5db3522cb0c3.tar.gz | |
MDEV-11254 cleanup: Remove buf_page_t::write_size
commit 6495806e59cc27313375fa8d431b7b8e777f73ff removed all reads
of buf_page_t::write_size. Let us remove the field altogether.
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 10 | ||||
| -rw-r--r-- | storage/innobase/include/buf0buf.h | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 954b16eb2d2..91d8cf0b18e 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -547,13 +547,13 @@ decompress: decompress_with_slot: ut_d(fil_page_type_validate(dst_frame)); - bpage->write_size = fil_page_decompress(slot->crypt_buf, - dst_frame); + ulint write_size = fil_page_decompress(slot->crypt_buf, + dst_frame); slot->release(); - ut_ad(!bpage->write_size || fil_page_type_validate(dst_frame)); + ut_ad(!write_size || fil_page_type_validate(dst_frame)); ut_ad(space->n_pending_ios > 0); - return bpage->write_size != 0; + return write_size != 0; } if (space->crypt_data @@ -1502,7 +1502,6 @@ buf_block_init( block->page.io_fix = BUF_IO_NONE; block->page.flush_observer = NULL; block->page.real_size = 0; - block->page.write_size = 0; block->modify_clock = 0; block->page.slot = NULL; @@ -5244,7 +5243,6 @@ buf_page_init_low( bpage->access_time = 0; bpage->newest_modification = 0; bpage->oldest_modification = 0; - bpage->write_size = 0; bpage->real_size = 0; bpage->slot = NULL; diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index d120dc36091..0536e2f8ac6 100644 --- a/storage/innobase/include/buf0buf.h +++ b/storage/innobase/include/buf0buf.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2020 MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -1508,11 +1508,6 @@ public: zip.data == NULL means an active buf_pool->watch */ - ulint write_size; /* Write size is set when this - page is first time written and then - if written again we check is TRIM - operation needed. */ - ulint real_size; /*!< Real size of the page Normal pages == UNIV_PAGE_SIZE page compressed pages, payload |