mirror of
https://github.com/MariaDB/server.git
synced 2025-07-08 20:38:14 +02:00
e056efdd6c
1. In case of system-versioned table add row_end into FTS_DOC_ID index
in fts_create_common_tables() and innobase_create_key_defs().
fts_n_uniq() returns 1 or 2 depending on whether the table is
system-versioned.
After this patch recreate of FTS_DOC_ID index is required for
existing system-versioned tables. If you see this message in error
log or server warnings: "InnoDB: Table db/t1 contains 2 indexes
inside InnoDB, which is different from the number of indexes 1
defined in the MariaDB" use this command to fix the table:
ALTER TABLE db.t1 FORCE;
2. Fix duplicate history for secondary unique index like it was done
in MDEV-23644 for clustered index (932ec586aa). In case of
existing history row which conflicts with currently inseted row we
check in row_ins_scan_sec_index_for_duplicate() whether that row
was inserted as part of current transaction. In that case we
indicate with DB_FOREIGN_DUPLICATE_KEY that new history row is not
needed and should be silently skipped.
3. Some parts of MDEV-21138 (7410ff436e) reverted. Skipping of
FTS_DOC_ID index for history rows made problems with purge
system. Now this is fixed differently by p.2.
4. wait_all_purged.inc checks that we didn't affect non-history rows
so they are deleted and purged correctly.
Additional FTS fixes
fts_init_get_doc_id(): exclude history rows from max_doc_id
calculation. fts_init_get_doc_id() callback is used only for crash
recovery.
fts_add_doc_by_id(): set max value for row_end field.
fts_read_stopword(): stopwords table can be system-versioned too. We
now read stopwords only for current data.
row_insert_for_mysql(): exclude history rows from doc_id validation.
row_merge_read_clustered_index(): exclude history_rows from doc_id
processing.
fts_load_user_stopword(): for versioned table retrieve row_end field
and skip history rows. For non-versioned table we retrieve 'value'
field twice (just for uniformity).
FTS tests for System Versioning now include maybe_versioning.inc which
adds 3 combinations:
'vers' for debug build sets sysvers_force and
sysvers_hide. sysvers_force makes every created table
system-versioned, sysvers_hide hides WITH SYSTEM VERSIONING
for SHOW CREATE.
Note: basic.test, stopword.test and versioning.test do not
require debug for 'vers' combination. This is controlled by
$modify_create_table in maybe_versioning.inc and these
tests run WITH SYSTEM VERSIONING explicitly which allows to
test 'vers' combination on non-debug builds.
'vers_trx' like 'vers' sets sysvers_force_trx and sysvers_hide. That
tests FTS with trx_id-based System Versioning.
'orig' works like before: no System Versioning is added, no debug is
required.
Upgrade/downgrade test for System Versioning is done by
innodb_fts.versioning. It has 2 combinations:
'prepare' makes binaries in std_data (requires old server and OLD_BINDIR).
It tests upgrade/downgrade against old server as well.
'upgrade' tests upgrade against binaries in std_data.
Cleanups:
Removed innodb-fts-stopword.test as it duplicates stopword.test
125 lines
3.2 KiB
Text
125 lines
3.2 KiB
Text
#
|
|
# BUG#22516559 MYSQL INSTANCE STALLS WHEN SYNCING FTS INDEX
|
|
#
|
|
|
|
--source include/have_innodb.inc
|
|
--source include/have_debug.inc
|
|
--source include/have_debug_sync.inc
|
|
--source include/have_log_bin.inc
|
|
--source include/count_sessions.inc
|
|
--source include/maybe_versioning.inc
|
|
|
|
SET @old_log_output = @@global.log_output;
|
|
SET @old_slow_query_log = @@global.slow_query_log;
|
|
SET @old_general_log = @@global.general_log;
|
|
SET @old_long_query_time = @@global.long_query_time;
|
|
SET @old_debug = @@global.debug_dbug;
|
|
|
|
SET GLOBAL log_output = 'TABLE';
|
|
SET GLOBAL general_log = 1;
|
|
SET GLOBAL slow_query_log = 1;
|
|
SET GLOBAL long_query_time = 1;
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
connection default;
|
|
|
|
--echo # Case 1: Sync blocks DML(insert) on the same table.
|
|
CREATE TABLE t1 (
|
|
FTS_DOC_ID BIGINT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
|
|
title VARCHAR(200),
|
|
FULLTEXT(title)
|
|
) ENGINE = InnoDB;
|
|
|
|
connection con1;
|
|
|
|
SET GLOBAL debug_dbug='+d,fts_instrument_sync_debug,fts_instrument_sync_sleep';
|
|
|
|
SET DEBUG_SYNC= 'fts_sync_begin SIGNAL begin WAIT_FOR continue';
|
|
|
|
send INSERT INTO t1(title) VALUES('mysql database');
|
|
|
|
connection con2;
|
|
|
|
SET DEBUG_SYNC= 'now WAIT_FOR begin';
|
|
|
|
send SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database');
|
|
|
|
connection default;
|
|
SET DEBUG_SYNC= 'now SIGNAL continue';
|
|
|
|
connection con1;
|
|
--echo /* connection con1 */ INSERT INTO t1(title) VALUES('mysql database');
|
|
--reap
|
|
|
|
connection con2;
|
|
--echo /* conneciton con2 */ SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database');
|
|
--reap
|
|
|
|
connection default;
|
|
-- echo # make con1 & con2 show up in mysql.slow_log
|
|
SELECT SLEEP(2);
|
|
-- echo # slow log results should only contain INSERT INTO t1.
|
|
SELECT sql_text FROM mysql.slow_log WHERE query_time >= '00:00:02';
|
|
|
|
SET GLOBAL debug_dbug = @old_debug;
|
|
TRUNCATE TABLE mysql.slow_log;
|
|
|
|
DROP TABLE t1;
|
|
|
|
--echo # Case 2: Sync blocks DML(insert) on other tables.
|
|
CREATE TABLE t1 (
|
|
FTS_DOC_ID BIGINT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
|
|
title VARCHAR(200),
|
|
FULLTEXT(title)
|
|
) ENGINE = InnoDB;
|
|
|
|
CREATE TABLE t2(id INT);
|
|
|
|
connection con1;
|
|
|
|
SET GLOBAL debug_dbug='+d,fts_instrument_sync_request,fts_instrument_sync_sleep';
|
|
|
|
SET DEBUG_SYNC= 'fts_instrument_sync_request SIGNAL begin WAIT_FOR continue';
|
|
|
|
send INSERT INTO t1(title) VALUES('mysql database');
|
|
|
|
connection con2;
|
|
|
|
SET DEBUG_SYNC= 'now WAIT_FOR begin';
|
|
|
|
send INSERT INTO t2 VALUES(1);
|
|
|
|
connection default;
|
|
SET DEBUG_SYNC= 'now SIGNAL continue';
|
|
|
|
connection con1;
|
|
--echo /* connection con1 */ INSERT INTO t1(title) VALUES('mysql database');
|
|
--reap
|
|
|
|
connection con2;
|
|
--echo /* conneciton con2 */ INSERT INTO t2 VALUES(1);
|
|
--reap
|
|
|
|
connection default;
|
|
SET DEBUG_SYNC = 'RESET';
|
|
-- echo # make con1 & con2 show up in mysql.slow_log
|
|
SELECT SLEEP(2);
|
|
-- echo # slow log results should be empty here.
|
|
SELECT sql_text FROM mysql.slow_log WHERE query_time >= '00:00:02';
|
|
|
|
SET GLOBAL debug_dbug = @old_debug;
|
|
TRUNCATE TABLE mysql.slow_log;
|
|
|
|
DROP TABLE t1,t2;
|
|
|
|
disconnect con1;
|
|
disconnect con2;
|
|
|
|
--source include/wait_until_count_sessions.inc
|
|
|
|
-- echo # Restore slow log settings.
|
|
SET GLOBAL log_output = @old_log_output;
|
|
SET GLOBAL general_log = @old_general_log;
|
|
SET GLOBAL slow_query_log = @old_slow_query_log;
|
|
SET GLOBAL long_query_time = @old_long_query_time;
|