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

Cleanup: Remove a constant parameter

Browse Source 
row_vers_vc_matches_cluster(): Remove the parameter in_purge,
which was always passed as in_purge=true.

This parameter became constant in
mysql/mysql-server@1dec14d346
and it always was constant in MariaDB starting from the
introduction of the function in
commit 2e814d4702d71a04388386a9f591d14a35980bfe (MariaDB 10.2.2).
This commit is contained in:
Marko Mäkelä 2020-04-24 10:42:08 +03:00
parent 9f19dbe0c3
commit 57ec41d6ea
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
storage/innobase/row/row0vers.cc
View File

@ -619,7 +619,6 @@ row_vers_build_cur_vrow_low(
/** Check a virtual column value index secondary virtual index matches /** Check a virtual column value index secondary virtual index matches
that of current cluster index record, which is recreated from information that of current cluster index record, which is recreated from information
stored in undo log stored in undo log
@param[in] in_purge called by purge thread
@param[in] rec record in the clustered index @param[in] rec record in the clustered index
@param[in] icentry the index entry built from a cluster row @param[in] icentry the index entry built from a cluster row
@param[in] clust_index cluster index @param[in] clust_index cluster index
@ -635,7 +634,6 @@ stored in undo log
static static
bool bool
row_vers_vc_matches_cluster( row_vers_vc_matches_cluster(
bool in_purge,
const rec_t* rec, const rec_t* rec,
const dtuple_t* icentry, const dtuple_t* icentry,
dict_index_t* clust_index, dict_index_t* clust_index,
@ -696,12 +694,6 @@ row_vers_vc_matches_cluster(
version = rec; version = rec;
/* If this is called by purge thread, set TRX_UNDO_PREV_IN_PURGE
bit to search the undo log until we hit the current undo log with
roll_ptr */
ulint status = (in_purge ? TRX_UNDO_PREV_IN_PURGE : 0)
| TRX_UNDO_GET_OLD_V_VALUE;
while (n_cmp_v_col < n_fields - n_non_v_col) { while (n_cmp_v_col < n_fields - n_non_v_col) {
heap2 = heap; heap2 = heap;
heap = mem_heap_create(1024); heap = mem_heap_create(1024);
@ -709,11 +701,12 @@ row_vers_vc_matches_cluster(
version, clust_index, clust_offsets); version, clust_index, clust_offsets);
ut_ad(cur_roll_ptr != 0); ut_ad(cur_roll_ptr != 0);
ut_ad(in_purge == (roll_ptr != 0)); ut_ad(roll_ptr != 0);
trx_undo_prev_version_build( trx_undo_prev_version_build(
rec, mtr, version, clust_index, clust_offsets, rec, mtr, version, clust_index, clust_offsets,
heap, &prev_version, NULL, vrow, status); heap, &prev_version, NULL, vrow,
TRX_UNDO_PREV_IN_PURGE | TRX_UNDO_GET_OLD_V_VALUE);
if (heap2) { if (heap2) {
mem_heap_free(heap2); mem_heap_free(heap2);
@ -997,7 +990,7 @@ row_vers_old_has_index_entry(
secondary indexes.) */ secondary indexes.) */
if (entry && row_vers_vc_matches_cluster( if (entry && row_vers_vc_matches_cluster(
also_curr, rec, entry, rec, entry,
clust_index, clust_offsets, clust_index, clust_offsets,
index, ientry, roll_ptr, index, ientry, roll_ptr,
trx_id, NULL, &vrow, mtr)) { trx_id, NULL, &vrow, mtr)) {