diff options
author | Monty <monty@mariadb.org> | 2020-01-28 23:23:51 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2020-03-24 21:00:03 +0200 |
commit | 91ab42a823b244a3d4b051ab79701b7a552f274a (patch) | |
tree | 21719a1583bb31297a1a9c07b6b90bee460a28a3 /sql/ha_partition.cc | |
parent | f51df1dc78ad2b8f1d3173f43e35dddecaf8a6e2 (diff) | |
download | mariadb-git-91ab42a823b244a3d4b051ab79701b7a552f274a.tar.gz |
Clean up and speed up interfaces for binary row logging
MDEV-21605 Clean up and speed up interfaces for binary row logging
MDEV-21617 Bug fix for previous version of this code
The intention is to have as few 'if' as possible in ha_write() and
related functions. This is done by pre-calculating once per statement the
row_logging state for all tables.
Benefits are simpler and faster code both when binary logging is disabled
and when it's enabled.
Changes:
- Added handler->row_logging to make it easy to check it table should be
row logged. This also made it easier to disabling row logging for system,
internal and temporary tables.
- The tables row_logging capabilities are checked once per "statements
that updates tables" in THD::binlog_prepare_for_row_logging() which
is called when needed from THD::decide_logging_format().
- Removed most usage of tmp_disable_binlog(), reenable_binlog() and
temporary saving and setting of thd->variables.option_bits.
- Moved checks that can't change during a statement from
check_table_binlog_row_based() to check_table_binlog_row_based_internal()
- Removed flag row_already_logged (used by sequence engine)
- Moved binlog_log_row() to a handler::
- Moved write_locked_table_maps() to THD::binlog_write_table_maps() as
most other related binlog functions are in THD.
- Removed binlog_write_table_map() and binlog_log_row_internal() as
they are now obsolete as 'has_transactions()' is pre-calculated in
prepare_for_row_logging().
- Remove 'is_transactional' argument from binlog_write_table_map() as this
can now be read from handler.
- Changed order of 'if's in handler::external_lock() and wsrep_mysqld.h
to first evaluate fast and likely cases before more complex ones.
- Added error checking in ha_write_row() and related functions if
binlog_log_row() failed.
- Don't clear check_table_binlog_row_based_result in
clear_cached_table_binlog_row_based_flag() as it's not needed.
- THD::clear_binlog_table_maps() has been replaced with
THD::reset_binlog_for_next_statement()
- Added 'MYSQL_OPEN_IGNORE_LOGGING_FORMAT' flag to open_and_lock_tables()
to avoid calculating of binary log format for internal opens. This flag
is also used to avoid reading statistics tables for internal tables.
- Added OPTION_BINLOG_LOG_OFF as a simple way to turn of binlog temporary
for create (instead of using THD::sql_log_bin_off.
- Removed flag THD::sql_log_bin_off (not needed anymore)
- Speed up THD::decide_logging_format() by remembering if blackhole engine
is used and avoid a loop over all tables if it's not used
(the common case).
- THD::decide_logging_format() is not called anymore if no tables are used
for the statement. This will speed up pure stored procedure code with
about 5%+ according to some simple tests.
- We now get annotated events on slave if a CREATE ... SELECT statement
is transformed on the slave from statement to row logging.
- In the original code, the master could come into a state where row
logging is enforced for all future events if statement could be used.
This is now partly fixed.
Other changes:
- Ensure that all tables used by a statement has query_id set.
- Had to restore the row_logging flag for not used tables in
THD::binlog_write_table_maps (not normal scenario)
- Removed injector::transaction::use_table(server_id_type sid, table tbl)
as it's not used.
- Cleaned up set_slave_thread_options()
- Some more DBUG_ENTER/DBUG_RETURN, code comments and minor indentation
changes.
- Ensure we only call THD::decide_logging_format_low() once in
mysql_insert() (inefficiency).
- Don't annotate INSERT DELAYED
- Removed zeroing pos_in_table_list in THD::open_temporary_table() as it's
already 0
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r-- | sql/ha_partition.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 41cf8bb2ccd..813351c658f 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -2131,12 +2131,10 @@ int ha_partition::copy_partitions(ulonglong * const copied, } else { - THD *thd= ha_thd(); /* Copy record to new handler */ (*copied)++; - tmp_disable_binlog(thd); /* Do not replicate the low-level changes. */ + DBUG_ASSERT(!m_new_file[new_part]->row_logging); result= m_new_file[new_part]->ha_write_row(m_rec0); - reenable_binlog(thd); if (result) goto error; } @@ -4374,11 +4372,10 @@ int ha_partition::write_row(const uchar * buf) start_part_bulk_insert(thd, part_id); - tmp_disable_binlog(thd); /* Do not replicate the low-level changes. */ + DBUG_ASSERT(!m_file[part_id]->row_logging); error= m_file[part_id]->ha_write_row(buf); if (have_auto_increment && !table->s->next_number_keypart) set_auto_increment_if_higher(table->next_number_field); - reenable_binlog(thd); exit: table->auto_increment_field_not_null= saved_auto_inc_field_not_null; @@ -4457,12 +4454,11 @@ int ha_partition::update_row(const uchar *old_data, const uchar *new_data) m_last_part= new_part_id; start_part_bulk_insert(thd, new_part_id); + DBUG_ASSERT(!m_file[new_part_id]->row_logging); if (new_part_id == old_part_id) { DBUG_PRINT("info", ("Update in partition %u", (uint) new_part_id)); - tmp_disable_binlog(thd); /* Do not replicate the low-level changes. */ error= m_file[new_part_id]->ha_update_row(old_data, new_data); - reenable_binlog(thd); goto exit; } else @@ -4481,16 +4477,12 @@ int ha_partition::update_row(const uchar *old_data, const uchar *new_data) table->next_number_field= NULL; DBUG_PRINT("info", ("Update from partition %u to partition %u", (uint) old_part_id, (uint) new_part_id)); - tmp_disable_binlog(thd); /* Do not replicate the low-level changes. */ error= m_file[new_part_id]->ha_write_row((uchar*) new_data); - reenable_binlog(thd); table->next_number_field= saved_next_number_field; if (unlikely(error)) goto exit; - tmp_disable_binlog(thd); /* Do not replicate the low-level changes. */ error= m_file[old_part_id]->ha_delete_row(old_data); - reenable_binlog(thd); if (unlikely(error)) goto exit; } @@ -4592,9 +4584,8 @@ int ha_partition::delete_row(const uchar *buf) if (!bitmap_is_set(&(m_part_info->lock_partitions), m_last_part)) DBUG_RETURN(HA_ERR_NOT_IN_LOCK_PARTITIONS); - tmp_disable_binlog(thd); + DBUG_ASSERT(!m_file[m_last_part]->row_logging); error= m_file[m_last_part]->ha_delete_row(buf); - reenable_binlog(thd); DBUG_RETURN(error); } |