1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trx_purge_rseg_get_next_history_log(): Remove a parameter

Browse Source 
Access purge_sys.rseg directly, instead of obscuring it with a parameter.
This commit is contained in:
Marko Mäkelä 2019-03-19 15:49:53 +02:00
parent cdb2208cd6
commit 26e5bff003
1 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
storage/innobase/trx/trx0purge.cc
View File

@ -1110,11 +1110,7 @@ static void trx_purge_truncate_history()
/***********************************************************************//** /***********************************************************************//**
Updates the last not yet purged history log info in rseg when we have purged Updates the last not yet purged history log info in rseg when we have purged
a whole undo log. Advances also purge_sys.purge_trx_no past the purged log. */ a whole undo log. Advances also purge_sys.purge_trx_no past the purged log. */
static static void trx_purge_rseg_get_next_history_log(
void
trx_purge_rseg_get_next_history_log(
/*================================*/
trx_rseg_t* rseg, /*!< in: rollback segment */
ulint* n_pages_handled)/*!< in/out: number of UNDO pages ulint* n_pages_handled)/*!< in/out: number of UNDO pages
handled */ handled */
{ {
@ -1124,20 +1120,21 @@ trx_purge_rseg_get_next_history_log(
trx_id_t trx_no; trx_id_t trx_no;
mtr_t mtr; mtr_t mtr;
mutex_enter(&(rseg->mutex)); mutex_enter(&purge_sys.rseg->mutex);
ut_a(rseg->last_page_no != FIL_NULL); ut_a(purge_sys.rseg->last_page_no != FIL_NULL);
purge_sys.tail.commit = rseg->last_commit + 1; purge_sys.tail.commit = purge_sys.rseg->last_commit + 1;
purge_sys.tail.undo_no = 0; purge_sys.tail.undo_no = 0;
purge_sys.next_stored = false; purge_sys.next_stored = false;
mtr_start(&mtr); mtr.start();
undo_page = trx_undo_page_get_s_latched( undo_page = trx_undo_page_get_s_latched(
page_id_t(rseg->space->id, rseg->last_page_no), &mtr); page_id_t(purge_sys.rseg->space->id,
purge_sys.rseg->last_page_no), &mtr);
log_hdr = undo_page + rseg->last_offset; log_hdr = undo_page + purge_sys.rseg->last_offset;
/* Increase the purge page count by one for every handled log */ /* Increase the purge page count by one for every handled log */
@ -1146,26 +1143,26 @@ trx_purge_rseg_get_next_history_log(
prev_log_addr = trx_purge_get_log_from_hist( prev_log_addr = trx_purge_get_log_from_hist(
flst_get_prev_addr(log_hdr + TRX_UNDO_HISTORY_NODE, &mtr)); flst_get_prev_addr(log_hdr + TRX_UNDO_HISTORY_NODE, &mtr));
if (prev_log_addr.page == FIL_NULL) { const bool empty = prev_log_addr.page == FIL_NULL;
if (empty) {
/* No logs left in the history list */ /* No logs left in the history list */
purge_sys.rseg->last_page_no = FIL_NULL;
}
rseg->last_page_no = FIL_NULL; mutex_exit(&purge_sys.rseg->mutex);
mtr.commit();
mutex_exit(&(rseg->mutex)); if (empty) {
mtr_commit(&mtr);
return; return;
} }
mutex_exit(&rseg->mutex);
mtr_commit(&mtr);
/* Read the previous log header. */ /* Read the previous log header. */
mtr_start(&mtr); mtr.start();
log_hdr = trx_undo_page_get_s_latched(page_id_t(rseg->space->id, log_hdr = trx_undo_page_get_s_latched(
prev_log_addr.page), page_id_t(purge_sys.rseg->space->id, prev_log_addr.page),
&mtr) &mtr)
+ prev_log_addr.boffset; + prev_log_addr.boffset;
trx_no = mach_read_from_8(log_hdr + TRX_UNDO_TRX_NO); trx_no = mach_read_from_8(log_hdr + TRX_UNDO_TRX_NO);
@ -1174,12 +1171,12 @@ trx_purge_rseg_get_next_history_log(
mtr_commit(&mtr); mtr_commit(&mtr);
mutex_enter(&(rseg->mutex)); mutex_enter(&purge_sys.rseg->mutex);
rseg->last_page_no = prev_log_addr.page; purge_sys.rseg->last_page_no = prev_log_addr.page;
rseg->last_offset = prev_log_addr.boffset; purge_sys.rseg->last_offset = prev_log_addr.boffset;
rseg->set_last_trx_no(trx_no, purge != 0); purge_sys.rseg->set_last_trx_no(trx_no, purge != 0);
rseg->needs_purge = purge != 0; purge_sys.rseg->needs_purge = purge != 0;
/* Purge can also produce events, however these are already ordered /* Purge can also produce events, however these are already ordered
in the rollback segment and any user generated event will be greater in the rollback segment and any user generated event will be greater
@ -1188,11 +1185,11 @@ trx_purge_rseg_get_next_history_log(
mutex_enter(&purge_sys.pq_mutex); mutex_enter(&purge_sys.pq_mutex);
purge_sys.purge_queue.push(*rseg); purge_sys.purge_queue.push(*purge_sys.rseg);
mutex_exit(&purge_sys.pq_mutex); mutex_exit(&purge_sys.pq_mutex);
mutex_exit(&rseg->mutex); mutex_exit(&purge_sys.rseg->mutex);
} }
/** Position the purge sys "iterator" on the undo record to use for purging. */ /** Position the purge sys "iterator" on the undo record to use for purging. */
@ -1287,8 +1284,7 @@ trx_purge_get_next_rec(
/* It is the dummy undo log record, which means that there is /* It is the dummy undo log record, which means that there is
no need to purge this undo log */ no need to purge this undo log */
trx_purge_rseg_get_next_history_log( trx_purge_rseg_get_next_history_log(n_pages_handled);
purge_sys.rseg, n_pages_handled);
/* Look for the next undo log and record to purge */ /* Look for the next undo log and record to purge */
@ -1315,8 +1311,7 @@ trx_purge_get_next_rec(
if (rec2 == NULL) { if (rec2 == NULL) {
mtr_commit(&mtr); mtr_commit(&mtr);
trx_purge_rseg_get_next_history_log( trx_purge_rseg_get_next_history_log(n_pages_handled);
purge_sys.rseg, n_pages_handled);
/* Look for the next undo log and record to purge */ /* Look for the next undo log and record to purge */