Skip to content

Commit 7ae21b1

Browse files
committed
MDEV-12353: Change the redo log encoding
log_t::FORMAT_10_5: physical redo log format tag log_phys_t: Buffered records in the physical format. The log record bytes will follow the last data field, making use of alignment padding that would otherwise be wasted. If there are multiple records for the same page, also those may be appended to an existing log_phys_t object if the memory is available. In the physical format, the first byte of a record identifies the record and its length (up to 15 bytes). For longer records, the immediately following bytes will encode the remaining length in a variable-length encoding. Usually, a variable-length-encoded page identifier will follow, followed by optional payload, whose length is included in the initially encoded total record length. When a mini-transaction is updating multiple fields in a page, it can avoid repeating the tablespace identifier and page number by setting the same_page flag (most significant bit) in the first byte of the log record. The byte offset of the record will be relative to where the previous record for that page ended. Until MDEV-14425 introduces a separate file-level log for redo log checkpoints and file operations, we will write the file-level records in the page-level redo log file. The record FILE_CHECKPOINT (which replaces MLOG_CHECKPOINT) will be removed in MDEV-14425, and one sequential scan of the page recovery log will suffice. Compared to MLOG_FILE_CREATE2, FILE_CREATE will not include any flags. If the information is needed, it can be parsed from WRITE records that modify FSP_SPACE_FLAGS. MLOG_ZIP_WRITE_STRING: Remove. The record was only introduced temporarily as part of this work, before being replaced with WRITE (along with MLOG_WRITE_STRING, MLOG_1BYTE, MLOG_nBYTES). mtr_buf_t::empty(): Check if the buffer is empty. mtr_t::m_n_log_recs: Remove. It suffices to check if m_log is empty. mtr_t::m_last, mtr_t::m_last_offset: End of the latest m_log record, for the same_page encoding. page_recv_t::last_offset: Reflects mtr_t::m_last_offset. Valid values for last_offset during recovery should be 0 or above 8. (The first 8 bytes of a page are the checksum and the page number, and neither are ever updated directly by log records.) Internally, the special value 1 indicates that the same_page form will not be allowed for the subsequent record. mtr_t::page_create(): Take the block descriptor as parameter, so that it can be compared to mtr_t::m_last. The INIT_INDEX_PAGE record will always followed by a subtype byte, because same_page records must be longer than 1 byte. trx_undo_page_init(): Combine the writes in WRITE record. trx_undo_header_create(): Write 4 bytes using a special MEMSET record that includes 1 bytes of length and 2 bytes of payload. flst_write_addr(): Define as a static function. Combine the writes. flst_zero_both(): Replaces two flst_zero_addr() calls. flst_init(): Do not inline the function. fsp_free_seg_inode(): Zerofill the whole inode. fsp_apply_init_file_page(): Initialize FIL_PAGE_PREV,FIL_PAGE_NEXT to FIL_NULL when using the physical format. btr_create(): Assert !page_has_siblings() because fsp_apply_init_file_page() must have been invoked. fil_ibd_create(): Do not write FILE_MODIFY after FILE_CREATE. fil_names_dirty_and_write(): Remove the parameter mtr. Write the records using a separate mini-transaction object, because any FILE_ records must be at the start of a mini-transaction log. recv_recover_page(): Add a fil_space_t* parameter. After applying log to the a ROW_FORMAT=COMPRESSED page, invoke buf_zip_decompress() to restore the uncompressed page. buf_page_io_complete(): Remove the temporary hack to discard the uncompressed page of a ROW_FORMAT=COMPRESSED page. page_zip_write_header(): Remove. Use mtr_t::write() or mtr_t::memset() instead, and update the compressed page frame separately. trx_undo_header_add_space_for_xid(): Remove. trx_undo_seg_create(): Perform the changes that were previously made by trx_undo_header_add_space_for_xid(). btr_reset_instant(): New function: Reset the table to MariaDB 10.2 or 10.3 format when rolling back an instant ALTER TABLE operation. page_rec_find_owner_rec(): Merge with the only callers. page_cur_insert_rec_low(): Combine writes by using a local buffer. MEMMOVE data from the preceding record whenever feasible (copying at least 3 bytes). page_cur_insert_rec_zip(): Combine writes to page header fields. PageBulk::insertPage(): Issue MEMMOVE records to copy a matching part from the preceding record. PageBulk::finishPage(): Combine the writes to the page header and to the sparse page directory slots. mtr_t::write(): Only log the least significant (last) bytes of multi-byte fields that actually differ. For updating FSP_SIZE, we must always write all 4 bytes to the redo log, so that the fil_space_set_recv_size() logic in recv_sys_t::parse() will work. mtr_t::memcpy(), mtr_t::zmemcpy(): Take a pointer argument instead of a numeric offset to the page frame. Only log the last bytes of multi-byte fields that actually differ. In fil_space_crypt_t::write_page0(), we must log also any unchanged bytes, so that recovery will recognize the record and invoke fil_crypt_parse(). Future work: MDEV-21724 Optimize page_cur_insert_rec_low() redo logging MDEV-21725 Optimize btr_page_reorganize_low() redo logging MDEV-21727 Optimize redo logging for ROW_FORMAT=COMPRESSED
1 parent 9869005 commit 7ae21b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3660
-1820
lines changed

extra/mariabackup/xtrabackup.cc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -590,26 +590,25 @@ std::string filename_to_spacename(const byte *filename, size_t len)
590590

591591
/** Report an operation to create, delete, or rename a file during backup.
592592
@param[in] space_id tablespace identifier
593-
@param[in] flags tablespace flags (NULL if not create)
593+
@param[in] create whether the file is being created
594594
@param[in] name file name (not NUL-terminated)
595595
@param[in] len length of name, in bytes
596596
@param[in] new_name new file name (NULL if not rename)
597597
@param[in] new_len length of new_name, in bytes (0 if NULL) */
598-
static void backup_file_op(ulint space_id, const byte* flags,
598+
static void backup_file_op(ulint space_id, bool create,
599599
const byte* name, ulint len,
600600
const byte* new_name, ulint new_len)
601601
{
602602

603-
ut_ad(!flags || !new_name);
603+
ut_ad(!create || !new_name);
604604
ut_ad(name);
605605
ut_ad(len);
606606
ut_ad(!new_name == !new_len);
607607
pthread_mutex_lock(&backup_mutex);
608608

609-
if (flags) {
609+
if (create) {
610610
ddl_tracker.id_to_name[space_id] = filename_to_spacename(name, len);
611-
msg("DDL tracking : create %zu \"%.*s\": %x",
612-
space_id, int(len), name, mach_read_from_4(flags));
611+
msg("DDL tracking : create %zu \"%.*s\"", space_id, int(len), name);
613612
}
614613
else if (new_name) {
615614
ddl_tracker.id_to_name[space_id] = filename_to_spacename(new_name, new_len);
@@ -632,14 +631,14 @@ static void backup_file_op(ulint space_id, const byte* flags,
632631
633632
We will abort backup in this case.
634633
*/
635-
static void backup_file_op_fail(ulint space_id, const byte* flags,
634+
static void backup_file_op_fail(ulint space_id, bool create,
636635
const byte* name, ulint len,
637636
const byte* new_name, ulint new_len)
638637
{
639638
bool fail;
640-
if (flags) {
641-
msg("DDL tracking : create %zu \"%.*s\": %x",
642-
space_id, int(len), name, mach_read_from_4(flags));
639+
if (create) {
640+
msg("DDL tracking : create %zu \"%.*s\"",
641+
space_id, int(len), name);
643642
std::string spacename = filename_to_spacename(name, len);
644643
fail = !check_if_skip_table(spacename.c_str());
645644
}

mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ WHERE engine = 'innodb'
136136
AND support IN ('YES', 'DEFAULT', 'ENABLED');
137137
COUNT(*)
138138
1
139-
FOUND 1 /InnoDB: .* started; log sequence number 121397[09]/ in mysqld.1.err
139+
FOUND 1 /InnoDB: .* started; log sequence number 12139[78]\d; transaction id 0/ in mysqld.1.err
140140
# Empty 10.2 redo log
141141
# restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-force-recovery=5 --innodb-log-file-size=2m
142142
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES

mysql-test/suite/innodb/r/log_alter_table.result

Lines changed: 0 additions & 21 deletions
This file was deleted.

mysql-test/suite/innodb/r/log_corruption.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ WHERE engine = 'innodb'
136136
AND support IN ('YES', 'DEFAULT', 'ENABLED');
137137
COUNT(*)
138138
1
139-
FOUND 1 /InnoDB: .* started; log sequence number 121397[09]/ in mysqld.1.err
139+
FOUND 1 /InnoDB: .* started; log sequence number 12139[78]\d; transaction id 0/ in mysqld.1.err
140140
# Empty 10.2 redo log
141141
# restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-force-recovery=5 --innodb-log-file-size=2m
142142
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES

mysql-test/suite/innodb/r/log_file_name_debug.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FOUND 1 /InnoDB: Tablespace 4294967280 was not found at .*, but there were no mo
1212
# restart: --debug=d,innodb_log_abort_3,ib_log --innodb-log-files-in-group=2 --innodb-log-file-size=4M
1313
SELECT * FROM t1;
1414
ERROR 42000: Unknown storage engine 'InnoDB'
15-
FOUND 1 /srv_prepare_to_delete_redo_log_files: ib_log: MLOG_CHECKPOINT.* written/ in mysqld.1.err
15+
FOUND 1 /srv_prepare_to_delete_redo_log_files: ib_log: FILE_CHECKPOINT.* written/ in mysqld.1.err
1616
# restart
1717
# restart
1818
DROP TABLE t1;

mysql-test/suite/innodb/t/log_alter_table.opt

Lines changed: 0 additions & 1 deletion
This file was deleted.

mysql-test/suite/innodb/t/log_alter_table.test

Lines changed: 0 additions & 46 deletions
This file was deleted.

mysql-test/suite/innodb/t/log_corruption.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
424424
# In encryption.innodb_encrypt_log_corruption, we would convert the
425425
# log to encrypted format. Writing an extra log checkpoint before the
426426
# redo log conversion would advance the LSN by the size of a
427-
# MLOG_CHECKPOINT record (9 bytes).
428-
--let SEARCH_PATTERN= InnoDB: .* started; log sequence number 121397[09]
427+
# FILE_CHECKPOINT record (12 bytes).
428+
--let SEARCH_PATTERN= InnoDB: .* started; log sequence number 12139[78]\d; transaction id 0
429429
--source include/search_pattern_in_file.inc
430430

431431
--echo # Empty 10.2 redo log

mysql-test/suite/innodb/t/log_file_name_debug.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SELECT * FROM t1;
3939
--source include/restart_mysqld.inc
4040
--error ER_UNKNOWN_STORAGE_ENGINE
4141
SELECT * FROM t1;
42-
--let SEARCH_PATTERN= srv_prepare_to_delete_redo_log_files: ib_log: MLOG_CHECKPOINT.* written
42+
--let SEARCH_PATTERN= srv_prepare_to_delete_redo_log_files: ib_log: FILE_CHECKPOINT.* written
4343
--source include/search_pattern_in_file.inc
4444

4545
--let $restart_parameters=

0 commit comments

Comments
 (0)