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/sql_servers.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/sql_servers.cc')
-rw-r--r-- | sql/sql_servers.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 1d12e95bbbb..fbf03dce212 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -404,6 +404,7 @@ insert_server(THD *thd, FOREIGN_SERVER *server) /* need to open before acquiring THR_LOCK_plugin or it will deadlock */ if (! (table= open_ltable(thd, &tables, TL_WRITE, MYSQL_LOCK_IGNORE_TIMEOUT))) goto end; + table->file->row_logging= 0; // Don't log to binary log /* insert the server into the table */ if (unlikely(error= insert_server_record(table, server))) @@ -542,9 +543,9 @@ int insert_server_record(TABLE *table, FOREIGN_SERVER *server) { int error; DBUG_ENTER("insert_server_record"); - tmp_disable_binlog(table->in_use); - table->use_all_columns(); + DBUG_ASSERT(!table->file->row_logging); + table->use_all_columns(); empty_record(table); /* set the field that's the PK to the value we're looking for */ @@ -577,8 +578,6 @@ int insert_server_record(TABLE *table, FOREIGN_SERVER *server) } else error= ER_FOREIGN_SERVER_EXISTS; - - reenable_binlog(table->in_use); DBUG_RETURN(error); } @@ -895,7 +894,8 @@ update_server_record(TABLE *table, FOREIGN_SERVER *server) { int error=0; DBUG_ENTER("update_server_record"); - tmp_disable_binlog(table->in_use); + DBUG_ASSERT(!table->file->row_logging); + table->use_all_columns(); /* set the field that's the PK to the value we're looking for */ table->field[0]->store(server->server_name, @@ -931,7 +931,6 @@ update_server_record(TABLE *table, FOREIGN_SERVER *server) } end: - reenable_binlog(table->in_use); DBUG_RETURN(error); } @@ -956,7 +955,8 @@ delete_server_record(TABLE *table, LEX_CSTRING *name) { int error; DBUG_ENTER("delete_server_record"); - tmp_disable_binlog(table->in_use); + DBUG_ASSERT(!table->file->row_logging); + table->use_all_columns(); /* set the field that's the PK to the value we're looking for */ @@ -980,7 +980,6 @@ delete_server_record(TABLE *table, LEX_CSTRING *name) table->file->print_error(error, MYF(0)); } - reenable_binlog(table->in_use); DBUG_RETURN(error); } |