From 236b350913a75dd2cb08120b01b9d33f1c64a2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 6 Feb 2020 12:26:01 +0200 Subject: [PATCH] Test: Remove innodb_log_optimize_ddl and FlushObserver When this is applied to a parent of the commit 5e62b6a5e06eb02cbde1e34e95e26f42d87fce02 the tests encryption.innodb-discard-import innodb.innodb-wl5522 will work, but the tests will hit a problem with that commit because even after purge_sys.stop() returned, purge worker tasks will keep running. During native table rebuild or index creation, InnoDB used to skip redo logging and write MLOG_INDEX_LOAD records to inform crash recovery and Mariabackup of the gaps in redo log. This is fragile and prohibits some optimizations, such as skipping the doublewrite buffer for newly (re)initialized pages (MDEV-19738). row_merge_write_redo(): Remove. We do not write MLOG_INDEX_LOAD records any more. Instead, we write full redo log. FlushObserver: Remove. fseg_free_page_func(): Remove the parameter log. Redo logging cannot be disabled. fil_space_t::redo_skipped_count: Remove. We cannot remove buf_block_t::skip_flush_check, because PageBulk will temporarily generate invalid B-tree pages in the buffer pool. --- storage/innobase/btr/btr0btr.cc | 4 +- storage/innobase/btr/btr0bulk.cc | 41 ++----- storage/innobase/btr/btr0cur.cc | 3 - storage/innobase/buf/buf0buf.cc | 4 +- storage/innobase/buf/buf0flu.cc | 155 +------------------------- storage/innobase/buf/buf0lru.cc | 95 +++++----------- storage/innobase/fil/fil0fil.cc | 6 +- storage/innobase/fsp/fsp0fsp.cc | 34 ++---- storage/innobase/handler/ha_innodb.cc | 25 ++++- storage/innobase/ibuf/ibuf0ibuf.cc | 4 +- storage/innobase/include/btr0bulk.h | 37 +----- storage/innobase/include/buf0buf.h | 4 +- storage/innobase/include/buf0flu.h | 90 +-------------- storage/innobase/include/buf0flu.ic | 10 +- storage/innobase/include/buf0lru.h | 8 +- storage/innobase/include/buf0types.h | 4 +- storage/innobase/include/fil0fil.h | 9 +- storage/innobase/include/fsp0fsp.h | 16 +-- storage/innobase/include/mtr0log.ic | 3 +- storage/innobase/include/mtr0mtr.h | 17 +-- storage/innobase/include/row0merge.h | 8 +- storage/innobase/include/trx0trx.h | 20 ---- storage/innobase/log/log0recv.cc | 2 +- storage/innobase/mtr/mtr0mtr.cc | 18 +-- storage/innobase/page/page0zip.cc | 4 +- storage/innobase/row/row0ftsort.cc | 8 +- storage/innobase/row/row0import.cc | 13 +-- storage/innobase/row/row0merge.cc | 82 +------------- storage/innobase/row/row0quiesce.cc | 8 +- storage/innobase/trx/trx0purge.cc | 11 +- storage/innobase/trx/trx0trx.cc | 19 +--- storage/innobase/trx/trx0undo.cc | 4 +- 32 files changed, 119 insertions(+), 647 deletions(-) diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc index 748efed022c..ea6d8bc9e62 100644 --- a/storage/innobase/btr/btr0btr.cc +++ b/storage/innobase/btr/btr0btr.cc @@ -2,7 +2,7 @@ Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2014, 2019, MariaDB Corporation. +Copyright (c) 2014, 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 @@ -766,7 +766,7 @@ void btr_page_free(dict_index_t* index, buf_block_t* block, mtr_t* mtr, : PAGE_HEADER + PAGE_BTR_SEG_TOP]; fseg_free_page(seg_header, index->table->space, block->page.id.page_no(), - block->index != NULL, !block->page.flush_observer, mtr); + block->index != NULL, mtr); /* The page was marked free in the allocation bitmap, but it should remain exclusively latched until mtr_t::commit() or until it diff --git a/storage/innobase/btr/btr0bulk.cc b/storage/innobase/btr/btr0bulk.cc index dd691000b79..0068f69edb8 100644 --- a/storage/innobase/btr/btr0bulk.cc +++ b/storage/innobase/btr/btr0bulk.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2014, 2019, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2019, MariaDB Corporation. +Copyright (c) 2017, 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 @@ -33,8 +33,6 @@ Created 03/11/2014 Shaohua Wang /** Innodb B-tree index fill factor for bulk load. */ uint innobase_fill_factor; -/** whether to reduce redo logging during ALTER TABLE */ -my_bool innodb_log_optimize_ddl; /** Initialize members, allocate page if needed and start mtr. Note: we commit all mtrs on failure. @@ -51,13 +49,7 @@ PageBulk::init() m_heap = mem_heap_create(1000); m_mtr.start(); - - if (m_flush_observer) { - m_mtr.set_log_mode(MTR_LOG_NO_REDO); - m_mtr.set_flush_observer(m_flush_observer); - } else { - m_index->set_modified(m_mtr); - } + m_index->set_modified(m_mtr); if (m_page_no == FIL_NULL) { mtr_t alloc_mtr; @@ -231,7 +223,7 @@ PageBulk::insert( m_heap_top += rec_size; m_rec_no += 1; - if (!m_flush_observer && !m_page_zip) { + if (!m_page_zip) { /* For ROW_FORMAT=COMPRESSED, redo log may be written in PageBulk::compress(). */ page_cur_insert_rec_write_log(insert_rec, rec_size, @@ -304,7 +296,7 @@ PageBulk::finish() ut_ad(!dict_index_is_spatial(m_index)); ut_ad(!page_get_instant(m_page)); - if (!m_flush_observer && !m_page_zip) { + if (!m_page_zip) { mlog_write_ulint(PAGE_HEADER + PAGE_N_DIR_SLOTS + m_page, 2 + slot_index, MLOG_2BYTES, &m_mtr); mlog_write_ulint(PAGE_HEADER + PAGE_HEAP_TOP + m_page, @@ -647,13 +639,7 @@ dberr_t PageBulk::latch() { m_mtr.start(); - - if (m_flush_observer) { - m_mtr.set_log_mode(MTR_LOG_NO_REDO); - m_mtr.set_flush_observer(m_flush_observer); - } else { - m_index->set_modified(m_mtr); - } + m_index->set_modified(m_mtr); /* In case the block is S-latched by page_cleaner. */ if (!buf_page_optimistic_get(RW_X_LATCH, m_block, m_modify_clock, @@ -696,7 +682,7 @@ BtrBulk::pageSplit( /* 2. create a new page. */ PageBulk new_page_bulk(m_index, m_trx->id, FIL_NULL, - page_bulk->getLevel(), m_flush_observer); + page_bulk->getLevel()); dberr_t err = new_page_bulk.init(); if (err != DB_SUCCESS) { return(err); @@ -830,7 +816,7 @@ BtrBulk::insert( if (level + 1 > m_page_bulks.size()) { PageBulk* new_page_bulk = UT_NEW_NOKEY(PageBulk(m_index, m_trx->id, FIL_NULL, - level, m_flush_observer)); + level)); err = new_page_bulk->init(); if (err != DB_SUCCESS) { UT_DELETE(new_page_bulk); @@ -884,8 +870,7 @@ BtrBulk::insert( /* Create a sibling page_bulk. */ PageBulk* sibling_page_bulk; sibling_page_bulk = UT_NEW_NOKEY(PageBulk(m_index, m_trx->id, - FIL_NULL, level, - m_flush_observer)); + FIL_NULL, level)); err = sibling_page_bulk->init(); if (err != DB_SUCCESS) { UT_DELETE(sibling_page_bulk); @@ -910,10 +895,6 @@ BtrBulk::insert( /* Important: log_free_check whether we need a checkpoint. */ if (page_is_leaf(sibling_page_bulk->getPage())) { if (trx_is_interrupted(m_trx)) { - if (m_flush_observer) { - m_flush_observer->interrupted(); - } - err = DB_INTERRUPTED; goto func_exit; } @@ -1007,8 +988,7 @@ BtrBulk::finish(dberr_t err) mtr_t mtr; buf_block_t* last_block; PageBulk root_page_bulk(m_index, m_trx->id, - m_index->page, m_root_level, - m_flush_observer); + m_index->page, m_root_level); mtr.start(); m_index->set_modified(mtr); @@ -1032,9 +1012,6 @@ BtrBulk::finish(dberr_t err) /* Remove last page. */ btr_page_free(m_index, last_block, &mtr); - /* Do not flush the last page. */ - last_block->page.flush_observer = NULL; - mtr.commit(); err = pageCommit(&root_page_bulk, NULL, false); diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index 20c5d0f7f3c..a8d0b6f4fbf 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -7408,7 +7408,6 @@ struct btr_blob_log_check_t { dict_index_t* index = m_pcur->index(); ulint offs = 0; ulint page_no = ULINT_UNDEFINED; - FlushObserver* observer = m_mtr->get_flush_observer(); if (UNIV_UNLIKELY(m_op == BTR_STORE_INSERT_BULK)) { offs = page_offset(*m_rec); @@ -7431,7 +7430,6 @@ struct btr_blob_log_check_t { m_mtr->start(); m_mtr->set_log_mode(log_mode); index->set_modified(*m_mtr); - m_mtr->set_flush_observer(observer); if (UNIV_UNLIKELY(m_op == BTR_STORE_INSERT_BULK)) { m_pcur->btr_cur.page_cur.block = btr_block_get( @@ -7627,7 +7625,6 @@ btr_store_big_rec_extern_fields( mtr.start(); index->set_modified(mtr); mtr.set_log_mode(btr_mtr->get_log_mode()); - mtr.set_flush_observer(btr_mtr->get_flush_observer()); buf_page_get(rec_block->page.id, rec_block->zip_size(), RW_X_LATCH, &mtr); diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 41d242a9360..c7d81b69d18 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -2,7 +2,7 @@ Copyright (c) 1995, 2018, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -1571,7 +1571,6 @@ buf_block_init( block->page.state = BUF_BLOCK_NOT_USED; block->page.buf_fix_count = 0; block->page.io_fix = BUF_IO_NONE; - block->page.flush_observer = NULL; block->page.init_on_flush = false; block->page.real_size = 0; block->page.write_size = 0; @@ -5415,7 +5414,6 @@ buf_page_init_for_read( bpage->state = BUF_BLOCK_ZIP_PAGE; bpage->id = page_id; - bpage->flush_observer = NULL; bpage->init_on_flush = false; ut_d(bpage->in_page_hash = FALSE); diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index 5a589936e5f..2beae453671 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/storage/innobase/buf/buf0flu.cc @@ -609,14 +609,6 @@ buf_flush_remove( ut_a(buf_flush_validate_skip(buf_pool)); #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ - /* If there is an observer that want to know if the asynchronous - flushing was done then notify it. */ - if (bpage->flush_observer != NULL) { - bpage->flush_observer->notify_remove(buf_pool, bpage); - - bpage->flush_observer = NULL; - } - buf_flush_list_mutex_exit(buf_pool); } @@ -1192,19 +1184,6 @@ buf_flush_page( rw_lock_sx_lock_gen(rw_lock, BUF_IO_WRITE); } - /* If there is an observer that want to know if the asynchronous - flushing was sent then notify it. - Note: we set flush observer to a page with x-latch, so we can - guarantee that notify_flush and notify_remove are called in pair - with s-latch on a uncompressed page. */ - if (bpage->flush_observer != NULL) { - buf_pool_mutex_enter(buf_pool); - - bpage->flush_observer->notify_flush(buf_pool, bpage); - - buf_pool_mutex_exit(buf_pool); - } - /* Even though bpage is not protected by any mutex at this point, it is safe to access bpage, because it is io_fixed and oldest_modification != 0. Thus, it cannot be relocated in the @@ -3633,9 +3612,7 @@ ulint buf_pool_get_dirty_pages_count( /*===========================*/ buf_pool_t* buf_pool, /*!< in: buffer pool */ - ulint id, /*!< in: space id to check */ - FlushObserver* observer) /*!< in: flush observer to check */ - + ulint id) /*!< in: space id to check */ { ulint count = 0; @@ -3652,10 +3629,7 @@ buf_pool_get_dirty_pages_count( ut_ad(bpage->in_flush_list); ut_ad(bpage->oldest_modification > 0); - if ((observer != NULL - && observer == bpage->flush_observer) - || (observer == NULL - && id == bpage->id.space())) { + if (id == bpage->id.space()) { ++count; } } @@ -3665,128 +3639,3 @@ buf_pool_get_dirty_pages_count( return(count); } - -/******************************************************************//** -Check if there are any dirty pages that belong to a space id in the flush list. -@return number of dirty pages present in all the buffer pools */ -static -ulint -buf_flush_get_dirty_pages_count( -/*============================*/ - ulint id, /*!< in: space id to check */ - FlushObserver* observer) /*!< in: flush observer to check */ -{ - ulint count = 0; - - for (ulint i = 0; i < srv_buf_pool_instances; ++i) { - buf_pool_t* buf_pool; - - buf_pool = buf_pool_from_array(i); - - count += buf_pool_get_dirty_pages_count(buf_pool, id, observer); - } - - return(count); -} - -/** FlushObserver constructor -@param[in] space tablespace -@param[in] trx trx instance -@param[in] stage performance schema accounting object, -used by ALTER TABLE. It is passed to log_preflush_pool_modified_pages() -for accounting. */ -FlushObserver::FlushObserver( - fil_space_t* space, - trx_t* trx, - ut_stage_alter_t* stage) - : - m_space(space), - m_trx(trx), - m_stage(stage), - m_interrupted(false) -{ - m_flushed = UT_NEW_NOKEY(std::vector(srv_buf_pool_instances)); - m_removed = UT_NEW_NOKEY(std::vector(srv_buf_pool_instances)); - - for (ulint i = 0; i < srv_buf_pool_instances; i++) { - m_flushed->at(i) = 0; - m_removed->at(i) = 0; - } - - DBUG_LOG("flush", "FlushObserver(): trx->id=" << m_trx->id); -} - -/** FlushObserver deconstructor */ -FlushObserver::~FlushObserver() -{ - ut_ad(buf_flush_get_dirty_pages_count(m_space->id, this) == 0); - - UT_DELETE(m_flushed); - UT_DELETE(m_removed); - - DBUG_LOG("flush", "~FlushObserver(): trx->id=" << m_trx->id); -} - -/** Check whether the operation has been interrupted */ -void FlushObserver::check_interrupted() -{ - if (trx_is_interrupted(m_trx)) { - interrupted(); - } -} - -/** Notify observer of a flush -@param[in] buf_pool buffer pool instance -@param[in] bpage buffer page to flush */ -void -FlushObserver::notify_flush( - buf_pool_t* buf_pool, - buf_page_t* bpage) -{ - ut_ad(buf_pool_mutex_own(buf_pool)); - - m_flushed->at(buf_pool->instance_no)++; - - if (m_stage != NULL) { - m_stage->inc(); - } - - DBUG_LOG("flush", "Flush " << bpage->id); -} - -/** Notify observer of a remove -@param[in] buf_pool buffer pool instance -@param[in] bpage buffer page flushed */ -void -FlushObserver::notify_remove( - buf_pool_t* buf_pool, - buf_page_t* bpage) -{ - ut_ad(buf_pool_mutex_own(buf_pool)); - - m_removed->at(buf_pool->instance_no)++; - - DBUG_LOG("flush", "Remove " << bpage->id); -} - -/** Flush dirty pages and wait. */ -void -FlushObserver::flush() -{ - ut_ad(m_trx); - - if (!m_interrupted && m_stage) { - m_stage->begin_phase_flush(buf_flush_get_dirty_pages_count( - m_space->id, this)); - } - - buf_LRU_flush_or_remove_pages(m_space->id, this); - - /* Wait for all dirty pages were flushed. */ - for (ulint i = 0; i < srv_buf_pool_instances; i++) { - while (!is_complete(i)) { - - os_thread_sleep(2000); - } - } -} diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc index 79fafa68c4c..bd1afd4b053 100644 --- a/storage/innobase/buf/buf0lru.cc +++ b/storage/innobase/buf/buf0lru.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2019, MariaDB Corporation. +Copyright (c) 2017, 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 @@ -466,19 +466,13 @@ buf_flush_try_yield( return(false); } -/******************************************************************//** -Removes a single page from a given tablespace inside a specific -buffer pool instance. +/** Remove a single page from flush_list. +@param[in,out] buf_pool buffer pool +@param[in,out] bpage buffer page to remove +@param[in] flush whether to flush the page before removing @return true if page was removed. */ -static MY_ATTRIBUTE((warn_unused_result)) -bool -buf_flush_or_remove_page( -/*=====================*/ - buf_pool_t* buf_pool, /*!< in/out: buffer pool instance */ - buf_page_t* bpage, /*!< in/out: bpage to remove */ - bool flush) /*!< in: flush to disk if true but - don't remove else remove without - flushing to disk */ +static bool buf_flush_or_remove_page(buf_pool_t* buf_pool, buf_page_t* bpage, + bool flush) { ut_ad(buf_pool_mutex_own(buf_pool)); ut_ad(buf_flush_list_mutex_own(buf_pool)); @@ -554,17 +548,11 @@ tablespace. The pages still remain a part of LRU and are evicted from the list as they age towards the tail of the LRU. @param[in,out] buf_pool buffer pool @param[in] id tablespace identifier -@param[in] observer flush observer (to check for interrupt), - or NULL if the files should not be written to +@param[in] flush whether to flush the pages before removing @param[in] first first page to be flushed or evicted @return whether all matching dirty pages were removed */ -static MY_ATTRIBUTE((warn_unused_result)) -bool -buf_flush_or_remove_pages( - buf_pool_t* buf_pool, - ulint id, - FlushObserver* observer, - ulint first) +static bool buf_flush_or_remove_pages(buf_pool_t* buf_pool, ulint id, + bool flush, ulint first) { buf_page_t* prev; buf_page_t* bpage; @@ -586,36 +574,19 @@ buf_flush_or_remove_pages( prev = UT_LIST_GET_PREV(list, bpage); - /* Flush the pages matching space id, - or pages matching the flush observer. */ - if (observer && observer->is_partial_flush()) { - if (observer != bpage->flush_observer) { - /* Skip this block. */ - } else if (!buf_flush_or_remove_page( - buf_pool, bpage, - !observer->is_interrupted())) { - all_freed = false; - } else if (!observer->is_interrupted()) { - /* The processing was successful. And during the - processing we have released the buf_pool mutex - when calling buf_page_flush(). We cannot trust - prev pointer. */ - goto rescan; - } - } else if (id != bpage->id.space()) { + if (id != bpage->id.space()) { /* Skip this block, because it is for a different tablespace. */ } else if (bpage->id.page_no() < first) { /* Skip this block, because it is below the limit. */ - } else if (!buf_flush_or_remove_page( - buf_pool, bpage, observer != NULL)) { + } else if (!buf_flush_or_remove_page(buf_pool, bpage, flush)) { /* Remove was unsuccessful, we have to try again by scanning the entire list from the end. This also means that we never released the buf_pool mutex. Therefore we can trust the prev pointer. - buf_flush_or_remove_page() released the + buf_remove_page() released the flush list mutex but not the buf_pool mutex. Therefore it is possible that a new page was added to the flush list. For example, in case @@ -631,7 +602,7 @@ buf_flush_or_remove_pages( iteration. */ all_freed = false; - } else if (observer) { + } else if (flush) { /* The processing was successful. And during the processing we have released the buf_pool mutex @@ -649,12 +620,6 @@ buf_flush_or_remove_pages( processed = 0; } - - /* The check for trx is interrupted is expensive, we want - to check every N iterations. */ - if (!processed && observer) { - observer->check_interrupted(); - } } buf_flush_list_mutex_exit(buf_pool); @@ -668,21 +633,15 @@ list and will be evicted from the LRU list as they age and move towards the tail of the LRU list. @param[in,out] buf_pool buffer pool @param[in] id tablespace identifier -@param[in] observer flush observer, - or NULL if the files should not be written to +@param[in] flush whether to flush the pages before removing @param[in] first first page to be flushed or evicted */ -static -void -buf_flush_dirty_pages( - buf_pool_t* buf_pool, - ulint id, - FlushObserver* observer, - ulint first) +static void buf_flush_dirty_pages(buf_pool_t* buf_pool, ulint id, bool flush, + ulint first) { for (;;) { buf_pool_mutex_enter(buf_pool); - bool freed = buf_flush_or_remove_pages(buf_pool, id, observer, + bool freed = buf_flush_or_remove_pages(buf_pool, id, flush, first); buf_pool_mutex_exit(buf_pool); @@ -697,28 +656,25 @@ buf_flush_dirty_pages( ut_ad(buf_flush_validate(buf_pool)); } - ut_ad((observer && observer->is_interrupted()) - || first - || buf_pool_get_dirty_pages_count(buf_pool, id, observer) == 0); + ut_ad(first + || buf_pool_get_dirty_pages_count(buf_pool, id) == 0); } /** Empty the flush list for all pages belonging to a tablespace. @param[in] id tablespace identifier -@param[in] observer flush observer, - or NULL if nothing is to be written +@param[in] flush whether to write the pages to files @param[in] first first page to be flushed or evicted */ -void buf_LRU_flush_or_remove_pages(ulint id, FlushObserver* observer, - ulint first) +void buf_LRU_flush_or_remove_pages(ulint id, bool flush, ulint first) { /* Pages in the system tablespace must never be discarded. */ - ut_ad(id || observer); + ut_ad(id || flush); for (ulint i = 0; i < srv_buf_pool_instances; i++) { - buf_flush_dirty_pages(buf_pool_from_array(i), id, observer, + buf_flush_dirty_pages(buf_pool_from_array(i), id, flush, first); } - if (observer && !observer->is_interrupted()) { + if (flush) { /* Ensure that all asynchronous IO is completed. */ os_aio_wait_until_no_pending_writes(); fil_flush(id); @@ -1108,7 +1064,6 @@ buf_LRU_get_free_block( memset(&block->page.zip, 0, sizeof block->page.zip); block->skip_flush_check = false; - block->page.flush_observer = NULL; return(block); } diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 9c497b59b9e..ec803e0f5b3 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -2391,11 +2391,7 @@ fil_close_tablespace( buffer pool. Thus we can clean the tablespace out of the buffer pool completely and permanently. The flag stop_new_ops also prevents fil_flush() from being applied to this tablespace. */ - - { - FlushObserver observer(space, trx, NULL); - buf_LRU_flush_or_remove_pages(id, &observer); - } + buf_LRU_flush_or_remove_pages(id, true); /* If the free is successful, the X lock will be released before the space memory data structure is freed. */ diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc index 691f86c11cc..27582fda136 100644 --- a/storage/innobase/fsp/fsp0fsp.cc +++ b/storage/innobase/fsp/fsp0fsp.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2019, MariaDB Corporation. +Copyright (c) 2017, 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 @@ -498,8 +498,7 @@ void fil_space_t::modify_check(const mtr_t& mtr) const break; case MTR_LOG_NO_REDO: ut_ad(purpose == FIL_TYPE_TEMPORARY - || purpose == FIL_TYPE_IMPORT - || redo_skipped_count); + || purpose == FIL_TYPE_IMPORT); return; case MTR_LOG_ALL: /* We may only write redo log for a persistent @@ -1220,10 +1219,8 @@ fsp_alloc_free_page( The page is marked as free and clean. @param[in,out] space tablespace @param[in] offset page number -@param[in] log whether to write MLOG_INIT_FREE_PAGE record @param[in,out] mtr mini-transaction */ -static void fsp_free_page(fil_space_t* space, page_no_t offset, - bool log, mtr_t* mtr) +static void fsp_free_page(fil_space_t* space, page_no_t offset, mtr_t* mtr) { fsp_header_t* header; xdes_t* descr; @@ -1275,12 +1272,7 @@ static void fsp_free_page(fil_space_t* space, page_no_t offset, return; } - if (UNIV_UNLIKELY(!log)) { - /* The last page freed in BtrBulk::finish() must be - written with redo logging disabled for the page - itself. The modifications of the allocation data - structures are covered by redo log. */ - } else if (byte* log_ptr = mlog_open(mtr, 11)) { + if (byte* log_ptr = mlog_open(mtr, 11)) { log_ptr = mlog_write_initial_log_record_low( MLOG_INIT_FREE_PAGE, space->id, offset, log_ptr, mtr); mlog_close(mtr, log_ptr); @@ -1553,7 +1545,7 @@ static void fsp_free_seg_inode( flst_remove(space_header + FSP_SEG_INODES_FREE, page + FSEG_INODE_PAGE_NODE, mtr); - fsp_free_page(space, page_get_page_no(page), true, mtr); + fsp_free_page(space, page_get_page_no(page), mtr); } } @@ -2592,7 +2584,6 @@ fseg_mark_page_used( @param[in] offset page number @param[in] ahi whether we may need to drop the adaptive hash index -@param[in] log whether to write MLOG_INIT_FREE_PAGE record @param[in,out] mtr mini-transaction */ static void @@ -2603,7 +2594,6 @@ fseg_free_page_low( #ifdef BTR_CUR_HASH_ADAPT bool ahi, #endif /* BTR_CUR_HASH_ADAPT */ - bool log, mtr_t* mtr) { xdes_t* descr; @@ -2656,7 +2646,7 @@ fseg_free_page_low( break; } - fsp_free_page(space, offset, log, mtr); + fsp_free_page(space, offset, mtr); return; } @@ -2709,8 +2699,8 @@ fseg_free_page_low( } #ifndef BTR_CUR_HASH_ADAPT -# define fseg_free_page_low(inode, space, offset, ahi, log, mtr) \ - fseg_free_page_low(inode, space, offset, log, mtr) +# define fseg_free_page_low(inode, space, offset, ahi, mtr) \ + fseg_free_page_low(inode, space, offset, mtr) #endif /* !BTR_CUR_HASH_ADAPT */ /** Free a page in a file segment. @@ -2719,7 +2709,6 @@ fseg_free_page_low( @param[in] offset page number @param[in] ahi whether we may need to drop the adaptive hash index -@param[in] log whether to write MLOG_INIT_FREE_PAGE record @param[in,out] mtr mini-transaction */ void fseg_free_page_func( @@ -2729,7 +2718,6 @@ fseg_free_page_func( #ifdef BTR_CUR_HASH_ADAPT bool ahi, #endif /* BTR_CUR_HASH_ADAPT */ - bool log, mtr_t* mtr) { DBUG_ENTER("fseg_free_page"); @@ -2745,7 +2733,7 @@ fseg_free_page_func( &iblock); fil_block_check_type(*iblock, FIL_PAGE_INODE, mtr); - fseg_free_page_low(seg_inode, space, offset, ahi, log, mtr); + fseg_free_page_low(seg_inode, space, offset, ahi, mtr); ut_d(buf_page_set_file_page_was_freed(page_id_t(space->id, offset))); @@ -2938,7 +2926,7 @@ fseg_free_step_func( fseg_free_page_low( inode, space, fseg_get_nth_frag_page_no(inode, n, mtr), - ahi, true, mtr); + ahi, mtr); n = fseg_find_last_used_frag_page_slot(inode, mtr); @@ -3009,7 +2997,7 @@ fseg_free_step_not_header_func( return(TRUE); } - fseg_free_page_low(inode, space, page_no, ahi, true, mtr); + fseg_free_page_low(inode, space, page_no, ahi, mtr); return(FALSE); } diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index da317ca23e5..29c27869af3 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -3545,6 +3545,11 @@ static my_bool innodb_log_checksums; /** Deprecation message for innodb_log_checksums */ static const char* innodb_log_checksums_deprecated = "The parameter innodb_log_checksums is deprecated and has no effect."; +/** Deprecated parameter with no effect */ +static my_bool innodb_log_optimize_ddl; +static const char* innodb_log_optimize_ddl_deprecated += "The parameter innodb_log_optimize_ddl is deprecated and has no effect."; + /** Deprecated parameter with no effect */ static ulong innodb_undo_logs; /** Deprecation message for innodb_undo_logs */ @@ -3863,6 +3868,11 @@ static int innodb_init_params() innodb_log_checksums = TRUE; } + if (UNIV_UNLIKELY(innodb_log_optimize_ddl)) { + sql_print_warning(innodb_log_optimize_ddl_deprecated); + innodb_log_optimize_ddl = FALSE; + } + if (UNIV_UNLIKELY(innodb_undo_logs != TRX_SYS_N_RSEGS)) { sql_print_warning(innodb_undo_logs_deprecated); innodb_undo_logs = TRX_SYS_N_RSEGS; @@ -18445,6 +18455,16 @@ innodb_log_checksums_warn(THD* thd, st_mysql_sys_var*, void*, const void*) innodb_log_checksums_deprecated); } +/** Issue a deprecation warning for SET GLOBAL innodb_log_optimize_ddl. +@param[in,out] thd client connection */ +static void +innodb_log_optimize_ddl_warn(THD* thd, st_mysql_sys_var*, void*, const void*) +{ + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, + HA_ERR_UNSUPPORTED, + innodb_log_optimize_ddl_deprecated); +} + /** Issue a deprecation warning for SET GLOBAL innodb_undo_logs. @param[in,out] thd client connection */ static void @@ -18993,10 +19013,7 @@ static MYSQL_SYSVAR_BOOL(log_compressed_pages, page_zip_log_pages, static MYSQL_SYSVAR_BOOL(log_optimize_ddl, innodb_log_optimize_ddl, PLUGIN_VAR_OPCMDARG, - "Reduce redo logging when natively creating indexes or rebuilding tables." - " Setting this OFF avoids delay due to page flushing and" - " allows concurrent backup.", - NULL, NULL, TRUE); + innodb_deprecated_ignored, NULL, innodb_log_optimize_ddl_warn, FALSE); static MYSQL_SYSVAR_ULONG(autoextend_increment, sys_tablespace_auto_extend_increment, diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index 3c5fedf1ff2..a72e1dc708d 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2019, MariaDB Corporation. +Copyright (c) 2016, 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 @@ -2031,7 +2031,7 @@ ibuf_remove_free_page(void) compile_time_assert(IBUF_SPACE_ID == 0); fseg_free_page(header_page + IBUF_HEADER + IBUF_TREE_SEG_HEADER, - fil_system.sys_space, page_no, false, true, &mtr); + fil_system.sys_space, page_no, false, &mtr); const page_id_t page_id(IBUF_SPACE_ID, page_no); diff --git a/storage/innobase/include/btr0bulk.h b/storage/innobase/include/btr0bulk.h index d1a8af22d68..5c9a7e6b6b9 100644 --- a/storage/innobase/include/btr0bulk.h +++ b/storage/innobase/include/btr0bulk.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2019, MariaDB Corporation. +Copyright (c) 2019, 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 @@ -52,14 +52,12 @@ class PageBulk @param[in] index B-tree index @param[in] page_no page number @param[in] level page level - @param[in] trx_id transaction id - @param[in] observer flush observer */ + @param[in] trx_id transaction id */ PageBulk( dict_index_t* index, trx_id_t trx_id, ulint page_no, - ulint level, - FlushObserver* observer) + ulint level) : m_heap(NULL), m_index(index), @@ -80,7 +78,6 @@ class PageBulk m_total_data(0), #endif /* UNIV_DEBUG */ m_modify_clock(0), - m_flush_observer(observer), m_err(DB_SUCCESS) { ut_ad(!dict_index_is_spatial(m_index)); @@ -257,9 +254,6 @@ class PageBulk when the block is re-pinned */ ib_uint64_t m_modify_clock; - /** Flush observer, or NULL if redo logging is enabled */ - FlushObserver* m_flush_observer; - /** Operation result DB_SUCCESS or error code */ dberr_t m_err; }; @@ -272,31 +266,15 @@ class BtrBulk public: /** Constructor @param[in] index B-tree index - @param[in] trx transaction - @param[in] observer flush observer */ + @param[in] trx transaction */ BtrBulk( dict_index_t* index, - const trx_t* trx, - FlushObserver* observer) + const trx_t* trx) : m_index(index), - m_trx(trx), - m_flush_observer(observer) + m_trx(trx) { ut_ad(!dict_index_is_spatial(index)); -#ifdef UNIV_DEBUG - if (m_flush_observer) - m_index->table->space->redo_skipped_count++; -#endif /* UNIV_DEBUG */ - } - - /** Destructor */ - ~BtrBulk() - { -#ifdef UNIV_DEBUG - if (m_flush_observer) - m_index->table->space->redo_skipped_count--; -#endif /* UNIV_DEBUG */ } /** Insert a tuple @@ -368,9 +346,6 @@ class BtrBulk /** Root page level */ ulint m_root_level; - /** Flush observer, or NULL if redo logging is enabled */ - FlushObserver*const m_flush_observer; - /** Page cursor vector for all level */ page_bulk_vector m_page_bulks; }; diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index 332b6d93aeb..d1432529cdc 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, 2019, 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 @@ -1554,8 +1554,6 @@ class buf_page_t { == (state == BUF_BLOCK_NOT_USED) */ #endif /* UNIV_DEBUG */ - FlushObserver* flush_observer; /*!< flush observer */ - lsn_t newest_modification; /*!< log sequence number of the youngest modification to diff --git a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h index 3753cb05651..80fd47cda81 100644 --- a/storage/innobase/include/buf0flu.h +++ b/storage/innobase/include/buf0flu.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2014, 2018, MariaDB Corporation. +Copyright (c) 2014, 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 @@ -188,9 +188,8 @@ buf_flush_note_modification( buf_block_t* block, /*!< in: block which is modified */ lsn_t start_lsn, /*!< in: start lsn of the first mtr in a set of mtr's */ - lsn_t end_lsn, /*!< in: end lsn of the last mtr in the + lsn_t end_lsn); /*!< in: end lsn of the last mtr in the set of mtr's */ - FlushObserver* observer); /*!< in: flush observer */ /********************************************************************//** Returns TRUE if the file page block is immediately suitable for replacement, i.e., transition FILE_PAGE => NOT_USED allowed. @@ -301,8 +300,7 @@ ulint buf_pool_get_dirty_pages_count( /*===========================*/ buf_pool_t* buf_pool, /*!< in: buffer pool */ - ulint id, /*!< in: space id to check */ - FlushObserver* observer); /*!< in: flush observer to check */ + ulint id); /*!< in: space id to check */ /*******************************************************************//** Synchronously flush dirty blocks from the end of the flush list of all buffer @@ -318,88 +316,6 @@ void buf_flush_request_force( lsn_t lsn_limit); -/** We use FlushObserver to track flushing of non-redo logged pages in bulk -create index(BtrBulk.cc).Since we disable redo logging during a index build, -we need to make sure that all dirty pages modifed by the index build are -flushed to disk before any redo logged operations go to the index. */ - -class FlushObserver { -public: - /** Constructor - @param[in,out] space tablespace - @param[in] trx trx instance - @param[in] stage performance schema accounting object, - used by ALTER TABLE. It is passed to log_preflush_pool_modified_pages() - for accounting. */ - FlushObserver(fil_space_t* space, trx_t* trx, ut_stage_alter_t* stage); - - /** Deconstructor */ - ~FlushObserver(); - - /** Check pages have been flushed and removed from the flush list - in a buffer pool instance. - @param[in] instance_no buffer pool instance no - @return true if the pages were removed from the flush list */ - bool is_complete(ulint instance_no) - { - return(m_flushed->at(instance_no) == m_removed->at(instance_no) - || m_interrupted); - } - - /** @return whether to flush only some pages of the tablespace */ - bool is_partial_flush() const { return m_stage != NULL; } - - /** @return whether the operation was interrupted */ - bool is_interrupted() const { return m_interrupted; } - - /** Interrupt observer not to wait. */ - void interrupted() - { - m_interrupted = true; - } - - /** Check whether the operation has been interrupted */ - void check_interrupted(); - - /** Flush dirty pages. */ - void flush(); - /** Notify observer of flushing a page - @param[in] buf_pool buffer pool instance - @param[in] bpage buffer page to flush */ - void notify_flush( - buf_pool_t* buf_pool, - buf_page_t* bpage); - - /** Notify observer of removing a page from flush list - @param[in] buf_pool buffer pool instance - @param[in] bpage buffer page flushed */ - void notify_remove( - buf_pool_t* buf_pool, - buf_page_t* bpage); -private: - /** Tablespace */ - fil_space_t* m_space; - - /** Trx instance */ - const trx_t* const m_trx; - - /** Performance schema accounting object, used by ALTER TABLE. - If not NULL, then stage->begin_phase_flush() will be called initially, - specifying the number of pages to be attempted to be flushed and - subsequently, stage->inc() will be called for each page we attempt to - flush. */ - ut_stage_alter_t* m_stage; - - /* Flush request sent */ - std::vector* m_flushed; - - /* Flush request finished */ - std::vector* m_removed; - - /* True if the operation was interrupted. */ - bool m_interrupted; -}; - #include "buf0flu.ic" #endif diff --git a/storage/innobase/include/buf0flu.ic b/storage/innobase/include/buf0flu.ic index 02f3d8ced57..c449a00e662 100644 --- a/storage/innobase/include/buf0flu.ic +++ b/storage/innobase/include/buf0flu.ic @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2019, 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 @@ -48,9 +49,8 @@ buf_flush_note_modification( buf_block_t* block, /*!< in: block which is modified */ lsn_t start_lsn, /*!< in: start lsn of the mtr that modified this block */ - lsn_t end_lsn, /*!< in: end lsn of the mtr that + lsn_t end_lsn) /*!< in: end lsn of the mtr that modified this block */ - FlushObserver* observer) /*!< in: flush observer */ { mutex_enter(&block->mutex); ut_ad(!srv_read_only_mode @@ -60,12 +60,6 @@ buf_flush_note_modification( ut_ad(block->page.newest_modification <= end_lsn); block->page.newest_modification = end_lsn; - /* Don't allow to set flush observer from non-null to null, - or from one observer to another. */ - ut_ad(block->page.flush_observer == NULL - || block->page.flush_observer == observer); - block->page.flush_observer = observer; - if (block->page.oldest_modification == 0) { buf_pool_t* buf_pool = buf_pool_from_block(block); diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h index 2468efb193f..2eb483381b4 100644 --- a/storage/innobase/include/buf0lru.h +++ b/storage/innobase/include/buf0lru.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2019, MariaDB Corporation. +Copyright (c) 2017, 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 @@ -63,11 +63,9 @@ bool buf_LRU_drop_page_hash_for_tablespace(dict_table_t* table) /** Empty the flush list for all pages belonging to a tablespace. @param[in] id tablespace identifier -@param[in,out] observer flush observer, - or NULL if nothing is to be written +@param[in] flush whether to write the pages to files @param[in] first first page to be flushed or evicted */ -void buf_LRU_flush_or_remove_pages(ulint id, FlushObserver* observer, - ulint first = 0); +void buf_LRU_flush_or_remove_pages(ulint id, bool flush, ulint first = 0); #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG /********************************************************************//** diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h index 969edfe2374..c7e41a37412 100644 --- a/storage/innobase/include/buf0types.h +++ b/storage/innobase/include/buf0types.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2019, MariaDB Corporation. +Copyright (c) 2019, 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 @@ -44,8 +44,6 @@ struct buf_pool_stat_t; struct buf_buddy_stat_t; /** Doublewrite memory struct */ struct buf_dblwr_t; -/** Flush observer for bulk create index */ -class FlushObserver; /** A buffer frame. @see page_t */ typedef byte buf_frame_t; diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index fa1fcaaf935..4cee96924dc 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2019, 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 @@ -38,8 +38,6 @@ Created 10/25/1995 Heikki Tuuri # include #endif -/** whether to reduce redo logging during ALTER TABLE */ -extern my_bool innodb_log_optimize_ddl; // Forward declaration extern my_bool srv_use_doublewrite_buf; extern struct buf_dblwr_t* buf_dblwr; @@ -106,11 +104,6 @@ struct fil_space_t { bool stop_new_ops; /** whether undo tablespace truncation is in progress */ bool is_being_truncated; -#ifdef UNIV_DEBUG - /** reference count for operations who want to skip redo log in the - file space in order to make modify_check() pass. */ - Atomic_counter redo_skipped_count; -#endif fil_type_t purpose;/*!< purpose */ UT_LIST_BASE_NODE_T(fil_node_t) chain; /*!< base node for the file chain */ diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h index a87f1fb2fe6..c77218a88d6 100644 --- a/storage/innobase/include/fsp0fsp.h +++ b/storage/innobase/include/fsp0fsp.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2019, 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 @@ -502,7 +502,6 @@ fsp_reserve_free_extents( @param[in] offset page number @param[in] ahi whether we may need to drop the adaptive hash index -@param[in] log whether to write MLOG_INIT_FREE_PAGE record @param[in,out] mtr mini-transaction */ void fseg_free_page_func( @@ -512,14 +511,13 @@ fseg_free_page_func( #ifdef BTR_CUR_HASH_ADAPT bool ahi, #endif /* BTR_CUR_HASH_ADAPT */ - bool log, mtr_t* mtr); #ifdef BTR_CUR_HASH_ADAPT -# define fseg_free_page(header, space, offset, ahi, log, mtr) \ - fseg_free_page_func(header, space, offset, ahi, log, mtr) +# define fseg_free_page(header, space, offset, ahi, mtr) \ + fseg_free_page_func(header, space, offset, ahi, mtr) #else /* BTR_CUR_HASH_ADAPT */ -# define fseg_free_page(header, space, offset, ahi, log, mtr) \ - fseg_free_page_func(header, space, offset, log, mtr) +# define fseg_free_page(header, space, offset, ahi, mtr) \ + fseg_free_page_func(header, space, offset, mtr) #endif /* BTR_CUR_HASH_ADAPT */ /** Determine whether a page is free. @param[in,out] space tablespace @@ -644,9 +642,7 @@ inline void fsp_init_file_page( block->page.id.space(), block->page.id.page_no(), log_ptr, mtr); mlog_close(mtr, log_ptr); - if (!innodb_log_optimize_ddl) { - block->page.init_on_flush = true; - } + block->page.init_on_flush = true; } } diff --git a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic index b7ba92ff1a5..53817170318 100644 --- a/storage/innobase/include/mtr0log.ic +++ b/storage/innobase/include/mtr0log.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 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 @@ -186,7 +186,6 @@ mlog_write_initial_log_record_low( || type == MLOG_FILE_DELETE || type == MLOG_FILE_CREATE2 || type == MLOG_FILE_RENAME2 - || type == MLOG_INDEX_LOAD || type == MLOG_TRUNCATE || type == MLOG_FILE_WRITE_CRYPT_DATA || mtr->is_named_space(space_id)); diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h index ee1e3eadd71..9603eaeb032 100644 --- a/storage/innobase/include/mtr0mtr.h +++ b/storage/innobase/include/mtr0mtr.h @@ -2,7 +2,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2019, 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 @@ -339,18 +339,6 @@ struct mtr_t { @return true if the mini-transaction is active */ bool is_active() const { return m_state == MTR_STATE_ACTIVE; } - /** Get flush observer - @return flush observer */ - FlushObserver* get_flush_observer() const { return m_flush_observer; } - - /** Set flush observer - @param[in] observer flush observer */ - void set_flush_observer(FlushObserver* observer) - { - ut_ad(observer == NULL || m_log_mode == MTR_LOG_NO_REDO); - m_flush_observer = observer; - } - #ifdef UNIV_DEBUG /** Check if memo contains the given item. @param memo memo stack @@ -471,9 +459,6 @@ struct mtr_t { /** State of the transaction */ mtr_state_t m_state; - /** Flush Observer */ - FlushObserver* m_flush_observer; - /** LSN at commit time */ lsn_t m_commit_lsn; }; diff --git a/storage/innobase/include/row0merge.h b/storage/innobase/include/row0merge.h index 27bd19252ac..f02bb359648 100644 --- a/storage/innobase/include/row0merge.h +++ b/storage/innobase/include/row0merge.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2019, MariaDB Corporation. +Copyright (c) 2015, 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 @@ -292,12 +292,6 @@ row_merge_drop_table( dict_table_t* table) /*!< in: table instance to drop */ MY_ATTRIBUTE((nonnull, warn_unused_result)); -/** Write an MLOG_INDEX_LOAD record to indicate in the redo-log -that redo-logging of individual index pages was disabled, and -the flushing of such pages to the data files was completed. -@param[in] index an index tree on which redo logging was disabled */ -void row_merge_write_redo(const dict_index_t* index); - /** Build indexes on a table by reading a clustered index, creating a temporary file containing index entries, merge sorting these index entries and inserting sorted index entries to indexes. diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 2245168b169..87e74e4e5be 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -41,7 +41,6 @@ Created 3/26/1996 Heikki Tuuri // Forward declaration struct mtr_t; -class FlushObserver; struct rw_trx_hash_element_t; /******************************************************************//** @@ -1051,11 +1050,6 @@ struct trx_t { /*------------------------------*/ char* detailed_error; /*!< detailed error message for last error, or empty. */ -private: - /** flush observer used to track flushing of non-redo logged pages - during bulk create index */ - FlushObserver* flush_observer; -public: /* Lock wait statistics */ ulint n_rec_lock_waits; /*!< Number of record lock waits, @@ -1108,20 +1102,6 @@ struct trx_t { return(assign_temp_rseg()); } - /** Set the innodb_log_optimize_ddl page flush observer - @param[in,out] space tablespace - @param[in,out] stage performance_schema accounting */ - void set_flush_observer(fil_space_t* space, ut_stage_alter_t* stage); - - /** Remove the flush observer */ - void remove_flush_observer(); - - /** @return the flush observer */ - FlushObserver* get_flush_observer() const - { - return flush_observer; - } - /** Transition to committed state, to release implicit locks. */ inline void commit_state(); diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 0b1f007316e..9361f0c8022 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -1974,7 +1974,7 @@ static void recv_recover_page(buf_block_t* block, mtr_t& mtr, if (start_lsn) { log_flush_order_mutex_enter(); - buf_flush_note_modification(block, start_lsn, end_lsn, NULL); + buf_flush_note_modification(block, start_lsn, end_lsn); log_flush_order_mutex_exit(); } else if (free_page && init) { /* There have been no operations than MLOG_INIT_FREE_PAGE. diff --git a/storage/innobase/mtr/mtr0mtr.cc b/storage/innobase/mtr/mtr0mtr.cc index 65fff8bb8e9..4e5213d79bd 100644 --- a/storage/innobase/mtr/mtr0mtr.cc +++ b/storage/innobase/mtr/mtr0mtr.cc @@ -297,11 +297,10 @@ struct DebugCheck { /** Release a resource acquired by the mini-transaction. */ struct ReleaseBlocks { /** Release specific object */ - ReleaseBlocks(lsn_t start_lsn, lsn_t end_lsn, FlushObserver* observer) + ReleaseBlocks(lsn_t start_lsn, lsn_t end_lsn) : m_end_lsn(end_lsn), - m_start_lsn(start_lsn), - m_flush_observer(observer) + m_start_lsn(start_lsn) { /* Do nothing */ } @@ -316,8 +315,7 @@ struct ReleaseBlocks { block = reinterpret_cast(slot->object); - buf_flush_note_modification(block, m_start_lsn, - m_end_lsn, m_flush_observer); + buf_flush_note_modification(block, m_start_lsn, m_end_lsn); } /** @return true always. */ @@ -340,9 +338,6 @@ struct ReleaseBlocks { /** Mini-transaction REDO end LSN */ lsn_t m_start_lsn; - - /** Flush observer */ - FlushObserver* m_flush_observer; }; /** Write the block contents to the REDO log */ @@ -391,7 +386,6 @@ void mtr_t::start() ut_d(m_user_space_id= TRX_SYS_SPACE); m_user_space= NULL; m_state= MTR_STATE_ACTIVE; - m_flush_observer= NULL; m_commit_lsn= 0; } @@ -436,8 +430,7 @@ mtr_t::commit() log_mutex_exit(); m_memo.for_each_block_in_reverse(CIterate - (ReleaseBlocks(start_lsn, m_commit_lsn, - m_flush_observer))); + (ReleaseBlocks(start_lsn, m_commit_lsn))); if (m_made_dirty) log_flush_order_mutex_exit(); @@ -563,8 +556,7 @@ mtr_t::x_lock_space(ulint space_id, const char* file, unsigned line) space = fil_space_get(space_id); ut_ad(get_log_mode() != MTR_LOG_NO_REDO || space->purpose == FIL_TYPE_TEMPORARY - || space->purpose == FIL_TYPE_IMPORT - || space->redo_skipped_count > 0); + || space->purpose == FIL_TYPE_IMPORT); } ut_ad(space); diff --git a/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc index a01100f2f0d..b431fc1b240 100644 --- a/storage/innobase/page/page0zip.cc +++ b/storage/innobase/page/page0zip.cc @@ -424,9 +424,7 @@ static void page_zip_compress_write_log(buf_block_t* block, /* Write the uncompressed trailer of the compressed page. */ mlog_catenate_string(mtr, page_zip->data + page_zip_get_size(page_zip) - trailer_size, trailer_size); - if (!innodb_log_optimize_ddl) { - block->page.init_on_flush = true; - } + block->page.init_on_flush = true; } /******************************************************//** diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index 45a5fee59ec..960fb78300f 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1672,9 +1672,7 @@ row_fts_merge_insert( == UT_BITS_IN_BYTES(aux_index->n_nullable)); /* Create bulk load instance */ - ins_ctx.btr_bulk = UT_NEW_NOKEY( - BtrBulk(aux_index, trx, psort_info[0].psort_common->trx - ->get_flush_observer())); + ins_ctx.btr_bulk = UT_NEW_NOKEY(BtrBulk(aux_index, trx)); /* Create tuple for insert */ ins_ctx.tuple = dtuple_create(heap, dict_index_get_n_fields(aux_index)); @@ -1808,9 +1806,5 @@ row_fts_merge_insert( ib::info() << "InnoDB_FTS: inserted " << count << " records"; } - if (psort_info[0].psort_common->trx->get_flush_observer()) { - row_merge_write_redo(aux_index); - } - return(error); } diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index 4323cf973eb..66cf7937320 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -4111,18 +4111,7 @@ row_import_for_mysql( /* Ensure that all pages dirtied during the IMPORT make it to disk. The only dirty pages generated should be from the pessimistic purge of delete marked records that couldn't be purged in Phase I. */ - - { - FlushObserver observer(prebuilt->table->space, trx, NULL); - buf_LRU_flush_or_remove_pages(prebuilt->table->space_id, - &observer); - - if (observer.is_interrupted()) { - ib::info() << "Phase III - Flush interrupted"; - return(row_import_error(prebuilt, trx, - DB_INTERRUPTED)); - } - } + buf_LRU_flush_or_remove_pages(prebuilt->table->space_id, true); ib::info() << "Phase IV - Flush complete"; prebuilt->table->space->set_imported(); diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index dad2e060678..861a1d645bc 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -2363,15 +2363,6 @@ row_merge_read_clustered_index( conv_heap, &err, &v_heap, eval_table, trx)))) { - /* Set the page flush observer for the - transaction when buffering the very first - record for a non-redo-logged operation. */ - if (file->n_rec == 0 && i == 0 - && innodb_log_optimize_ddl) { - trx->set_flush_observer( - new_table->space, stage); - } - /* If we are creating FTS index, a single row can generate more records for tokenized word */ @@ -2510,8 +2501,7 @@ row_merge_read_clustered_index( if (clust_btr_bulk == NULL) { clust_btr_bulk = UT_NEW_NOKEY( BtrBulk(index[i], - trx, - trx->get_flush_observer())); + trx)); } else { clust_btr_bulk->latch(); } @@ -2625,9 +2615,7 @@ row_merge_read_clustered_index( trx->error_key_num = i; goto all_done;); - BtrBulk btr_bulk( - index[i], trx, - trx->get_flush_observer()); + BtrBulk btr_bulk(index[i], trx); err = row_merge_insert_index_tuples( index[i], old_table, @@ -4507,26 +4495,6 @@ row_merge_drop_table( trx, SQLCOM_DROP_TABLE, false, false)); } -/** Write an MLOG_INDEX_LOAD record to indicate in the redo-log -that redo-logging of individual index pages was disabled, and -the flushing of such pages to the data files was completed. -@param[in] index an index tree on which redo logging was disabled */ -void row_merge_write_redo(const dict_index_t* index) -{ - ut_ad(!index->table->is_temporary()); - ut_ad(!(index->type & (DICT_SPATIAL | DICT_FTS))); - - mtr_t mtr; - mtr.start(); - byte* log_ptr = mlog_open(&mtr, 11 + 8); - log_ptr = mlog_write_initial_log_record_low( - MLOG_INDEX_LOAD, - index->table->space_id, index->page, log_ptr, &mtr); - mach_write_to_8(log_ptr, index->id); - mlog_close(&mtr, log_ptr + 8); - mtr.commit(); -} - /** Build indexes on a table by reading a clustered index, creating a temporary file containing index entries, merge sorting these index entries and inserting sorted index entries to indexes. @@ -4879,8 +4847,7 @@ row_merge_build_indexes( os_thread_sleep(20000000);); /* 20 sec */ if (error == DB_SUCCESS) { - BtrBulk btr_bulk(sort_idx, trx, - trx->get_flush_observer()); + BtrBulk btr_bulk(sort_idx, trx); pct_cost = (COST_BUILD_INDEX_STATIC + (total_dynamic_cost * merge_files[k].offset / @@ -4926,21 +4893,10 @@ row_merge_build_indexes( if (indexes[i]->type & DICT_FTS) { row_fts_psort_info_destroy(psort_info, merge_info); fts_psort_initiated = false; - } else if (dict_index_is_spatial(indexes[i])) { - /* We never disable redo logging for - creating SPATIAL INDEX. Avoid writing any - unnecessary MLOG_INDEX_LOAD record. */ } else if (old_table != new_table) { ut_ad(!sort_idx->online_log); ut_ad(sort_idx->online_status == ONLINE_INDEX_COMPLETE); - } else if (FlushObserver* flush_observer = - trx->get_flush_observer()) { - if (error != DB_SUCCESS) { - flush_observer->interrupted(); - } - flush_observer->flush(); - row_merge_write_redo(indexes[i]); } if (old_table != new_table @@ -5042,37 +4998,5 @@ row_merge_build_indexes( } DBUG_EXECUTE_IF("ib_index_crash_after_bulk_load", DBUG_SUICIDE();); - - if (FlushObserver* flush_observer = trx->get_flush_observer()) { - - DBUG_EXECUTE_IF("ib_index_build_fail_before_flush", - error = DB_INTERRUPTED; - ); - - if (error != DB_SUCCESS) { - flush_observer->interrupted(); - } - - flush_observer->flush(); - - if (old_table != new_table) { - for (const dict_index_t* index - = dict_table_get_first_index(new_table); - index != NULL; - index = dict_table_get_next_index(index)) { - if (!(index->type - & (DICT_FTS | DICT_SPATIAL))) { - row_merge_write_redo(index); - } - } - } - - trx->remove_flush_observer(); - - if (trx_is_interrupted(trx)) { - error = DB_INTERRUPTED; - } - } - DBUG_RETURN(error); } diff --git a/storage/innobase/row/row0quiesce.cc b/storage/innobase/row/row0quiesce.cc index 02c8c495e88..cf2155f6c44 100644 --- a/storage/innobase/row/row0quiesce.cc +++ b/storage/innobase/row/row0quiesce.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2019, MariaDB Corporation. +Copyright (c) 2017, 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 @@ -535,11 +535,7 @@ row_quiesce_table_start( } if (!trx_is_interrupted(trx)) { - { - FlushObserver observer(table->space, trx, NULL); - buf_LRU_flush_or_remove_pages(table->space_id, - &observer); - } + buf_LRU_flush_or_remove_pages(table->space_id, true); if (trx_is_interrupted(trx)) { diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index 356999b17b2..e74fb29ccdf 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2019, MariaDB Corporation. +Copyright (c) 2017, 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 @@ -675,14 +675,7 @@ static void trx_purge_truncate_history() mini-transaction commit and the server was killed, then discarding the to-be-trimmed pages without flushing would break crash recovery. So, we cannot avoid the write. */ - { - FlushObserver observer( - purge_sys.truncate.current, - UT_LIST_GET_FIRST(purge_sys.query->thrs) - ->graph->trx, - NULL); - buf_LRU_flush_or_remove_pages(space.id, &observer); - } + buf_LRU_flush_or_remove_pages(space.id, true); log_free_check(); diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index bf26b5b20ef..2a710b6a5ec 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2019, MariaDB Corporation. +Copyright (c) 2015, 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 @@ -161,8 +161,6 @@ trx_init( trx->lock.rec_cached = 0; trx->lock.table_cached = 0; - - ut_ad(trx->get_flush_observer() == NULL); } /** For managing the life-cycle of the trx_t instance that we get @@ -906,21 +904,6 @@ static trx_rseg_t* trx_assign_rseg_low() return(rseg); } -/** Set the innodb_log_optimize_ddl page flush observer -@param[in,out] space tablespace -@param[in,out] stage performance_schema accounting */ -void trx_t::set_flush_observer(fil_space_t* space, ut_stage_alter_t* stage) -{ - flush_observer = UT_NEW_NOKEY(FlushObserver(space, this, stage)); -} - -/** Remove the flush observer */ -void trx_t::remove_flush_observer() -{ - UT_DELETE(flush_observer); - flush_observer = NULL; -} - /** Assign a rollback segment for modifying temporary tables. @return the assigned rollback segment */ trx_rseg_t* diff --git a/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc index 933a9d2600e..ad9eba8a7b3 100644 --- a/storage/innobase/trx/trx0undo.cc +++ b/storage/innobase/trx/trx0undo.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2014, 2019, MariaDB Corporation. +Copyright (c) 2014, 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 @@ -853,7 +853,7 @@ trx_undo_free_page( TRX_UNDO_PAGE_HDR + TRX_UNDO_PAGE_NODE + undo_page, mtr); fseg_free_page(TRX_UNDO_SEG_HDR + TRX_UNDO_FSEG_HEADER + header_page, - rseg->space, page_no, false, true, mtr); + rseg->space, page_no, false, mtr); const fil_addr_t last_addr = flst_get_last( TRX_UNDO_SEG_HDR + TRX_UNDO_PAGE_LIST + header_page, mtr); -- 2.25.0