Skip to content

Commit 8535c26

Browse files
committed
Remove FIXME comments that refer to an early MDEV-14425 plan
In MDEV-14425, an early plan was to introduce a separate log file for file-level records and checkpoint information. The reasoning was that fil_system.mutex contention would be reduced by not having to maintain fil_system.named_spaces. The mutex contention was actually fixed in MDEV-23855 by making some data fields in fil_space_t and fil_node_t use std::atomic. Using a single circular log file simplifies recovery and backup.
1 parent c104a01 commit 8535c26

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

storage/innobase/include/mtr0types.h

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2017, 2021, MariaDB Corporation.
4+
Copyright (c) 2017, 2022, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -115,13 +115,9 @@ If same_page=1 is set in a record that follows a same_page=0 record
115115
in a mini-transaction, the tablespace identifier and page number
116116
fields will be omitted.
117117
118-
(For some file-oriented records (if same_page=1 for the first records
119-
of a mini-transaction), we will write tablespace identifier using the
120-
same 1-to-5-byte encoding. TBD: describe the exact format of
121-
file-oriented records. With MDEV-14425, we could write file-level log
122-
records to a separate file, not interleaved with page-level redo log
123-
at all. We could reserve the file ib_logfile0 for checkpoint information
124-
and for file-level redo log records.)
118+
For FILE_ records (if same_page=1 for the first record
119+
of a mini-transaction), we will write a tablespace identifier and
120+
a page number (always 0) using the same 1-to-5-byte encoding.
125121
126122
For FREE_PAGE or INIT_PAGE, if same_page=1, the record will be treated
127123
as corrupted (or reserved for future extension). The type code must
@@ -304,18 +300,14 @@ enum mfile_type_t
304300
FILE_RENAME = 0xa0,
305301
/** Modify a file. Followed by tablespace ID and the file name. */
306302
FILE_MODIFY = 0xb0,
307-
#if 1 /* MDEV-14425 FIXME: Remove this! */
308303
/** End-of-checkpoint marker. Followed by 2 dummy bytes of page identifier,
309304
8 bytes of LSN, and padded with a NUL; @see SIZE_OF_FILE_CHECKPOINT. */
310305
FILE_CHECKPOINT = 0xf0
311-
#endif
312306
};
313307

314-
#if 1 /* MDEV-14425 FIXME: Remove this! */
315308
/** Size of a FILE_CHECKPOINT record, including the trailing byte to
316309
terminate the mini-transaction. */
317310
constexpr byte SIZE_OF_FILE_CHECKPOINT= 3/*type,page_id*/ + 8/*LSN*/ + 1;
318-
#endif
319311

320312
#ifndef UNIV_INNOCHECKSUM
321313
/** Types for the mlock objects to store in the mtr_t::m_memo */

storage/innobase/log/log0recv.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,9 +1832,7 @@ bool recv_sys_t::parse(lsn_t checkpoint_lsn, store_t *store, bool apply)
18321832
#endif
18331833

18341834
uint32_t space_id= 0, page_no= 0, last_offset= 0;
1835-
#if 1 /* MDEV-14425 FIXME: remove this */
18361835
bool got_page_op= false;
1837-
#endif
18381836
for (l= log; l < end; l+= rlen)
18391837
{
18401838
const byte *const recs= l;
@@ -2104,11 +2102,9 @@ bool recv_sys_t::parse(lsn_t checkpoint_lsn, store_t *store, bool apply)
21042102
pages.erase(i);
21052103
}
21062104
}
2107-
#if 1 /* MDEV-14425 FIXME: this must be in the checkpoint file only! */
21082105
else if (rlen)
21092106
{
21102107
switch (b & 0xf0) {
2111-
# if 1 /* MDEV-14425 FIXME: Remove this! */
21122108
case FILE_CHECKPOINT:
21132109
if (space_id == 0 && page_no == 0 && rlen == 8)
21142110
{
@@ -2139,7 +2135,6 @@ bool recv_sys_t::parse(lsn_t checkpoint_lsn, store_t *store, bool apply)
21392135
}
21402136
continue;
21412137
}
2142-
# endif
21432138
/* fall through */
21442139
default:
21452140
if (!srv_force_recovery)
@@ -2217,7 +2212,6 @@ bool recv_sys_t::parse(lsn_t checkpoint_lsn, store_t *store, bool apply)
22172212
return true;
22182213
}
22192214
}
2220-
#endif
22212215
else
22222216
goto malformed;
22232217
}

0 commit comments

Comments
 (0)