mirror of
https://github.com/MariaDB/server.git
synced 2025-11-30 05:23:50 +03:00
7dc6066dea
dict_stats_exec_sql(): Expect the caller to always provide a transaction. Remove some redundant assertions. The caller must hold dict_sys->mutex, but holding dict_operation_lock is only necessary for accessing data dictionary tables, which we are not accessing. dict_stats_save_index_stat(): Acquire dict_sys->mutex for invoking dict_stats_exec_sql(). dict_stats_save(), dict_stats_update_for_index(), dict_stats_update(), dict_stats_drop_index(), dict_stats_delete_from_table_stats(), dict_stats_delete_from_index_stats(), dict_stats_drop_table(), dict_stats_rename_in_table_stats(), dict_stats_rename_in_index_stats(), dict_stats_rename_table(): Use a single caller-provided transaction that is started and committed or rolled back by the caller. dict_stats_process_entry_from_recalc_pool(): Let the caller provide a transaction object. ha_innobase::open(): Pass a transaction to dict_stats_init(). ha_innobase::create(), ha_innobase::discard_or_import_tablespace(): Pass a transaction to dict_stats_update(). ha_innobase::rename_table(): Pass a transaction to dict_stats_rename_table(). We do not use the same transaction as the one that updated the data dictionary tables, because we already released the dict_operation_lock. (FIXME: there is a race condition; a lock wait on SYS_* tables could occur in another DDL transaction until the data dictionary transaction is committed.) ha_innobase::info_low(): Pass a transaction to dict_stats_update() when calculating persistent statistics. alter_stats_norebuild(), alter_stats_rebuild(): Update the persistent statistics as well. In this way, a single transaction will be used for updating the statistics of a whole table, even for partitioned tables. ha_innobase::commit_inplace_alter_table(): Drop statistics for all partitions when adding or dropping virtual columns, so that the statistics will be recalculated on the next handler::open(). This is a refactored version of Oracle Bug#22469660 fix. RecLock::add_to_waitq(), lock_table_enqueue_waiting(): Do not allow a lock wait to occur for updating statistics in a data dictionary transaction, such as DROP TABLE. Instead, return the previously unused error code DB_QUE_THR_SUSPENDED. row_merge_lock_table(), row_mysql_lock_table(): Remove dead code for handling DB_QUE_THR_SUSPENDED. row_drop_table_for_mysql(), row_truncate_table_for_mysql(): Drop the statistics as part of the data dictionary transaction. After TRUNCATE TABLE, the statistics will be recalculated on subsequent ha_innobase::open(), similar to how the logic after the above-mentioned Oracle Bug#22469660 fix in ha_innobase::commit_inplace_alter_table() works. btr_defragment_thread(): Use a single transaction object for updating defragmentation statistics. dict_stats_save_defrag_stats(), dict_stats_save_defrag_stats(), dict_stats_process_entry_from_defrag_pool(), dict_defrag_process_entries_from_defrag_pool(), dict_stats_save_defrag_summary(), dict_stats_save_defrag_stats(): Add a parameter for the transaction. dict_stats_empty_table(): Make public. This will be called by row_truncate_table_for_mysql() after dropping persistent statistics, to clear the memory-based statistics as well.
62 lines
1.3 KiB
Plaintext
62 lines
1.3 KiB
Plaintext
#
|
|
# Test the persistent stats feature when DROPping a table or an
|
|
# index when the corresponding rows in the stats tables are locked
|
|
#
|
|
|
|
-- source include/have_innodb.inc
|
|
|
|
-- disable_warnings
|
|
-- disable_query_log
|
|
|
|
DROP TABLE IF EXISTS innodb_stats_drop_locked;
|
|
|
|
CREATE TABLE innodb_stats_drop_locked (c INT, KEY c_key (c))
|
|
ENGINE=INNODB STATS_PERSISTENT=1;
|
|
|
|
ANALYZE TABLE innodb_stats_drop_locked;
|
|
|
|
-- enable_warnings
|
|
-- enable_query_log
|
|
|
|
SET autocommit=0;
|
|
|
|
SELECT table_name FROM mysql.innodb_table_stats
|
|
WHERE table_name='innodb_stats_drop_locked'
|
|
FOR UPDATE;
|
|
|
|
SELECT table_name FROM mysql.innodb_index_stats
|
|
WHERE table_name='innodb_stats_drop_locked'
|
|
FOR UPDATE;
|
|
|
|
-- connect (con1,localhost,root,,)
|
|
|
|
-- connection con1
|
|
|
|
ALTER TABLE innodb_stats_drop_locked DROP INDEX c_key;
|
|
|
|
# the index should be gone
|
|
SHOW CREATE TABLE innodb_stats_drop_locked;
|
|
|
|
DROP TABLE innodb_stats_drop_locked;
|
|
|
|
# the table should be gone
|
|
SHOW TABLES;
|
|
|
|
-- connection default
|
|
|
|
-- disconnect con1
|
|
|
|
COMMIT;
|
|
|
|
# the stats should be there
|
|
|
|
SELECT table_name FROM mysql.innodb_table_stats
|
|
WHERE table_name='innodb_stats_drop_locked';
|
|
|
|
SELECT table_name FROM mysql.innodb_index_stats
|
|
WHERE table_name='innodb_stats_drop_locked';
|
|
|
|
--disable_query_log
|
|
call mtr.add_suppression("Unable to delete statistics for table test\\.innodb_stats_drop_locked: Lock wait");
|
|
--enable_query_log
|