mirror of
https://github.com/MariaDB/server.git
synced 2025-02-04 21:02:17 +01: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
55 lines
2 KiB
SQL
55 lines
2 KiB
SQL
if ($stopword_stage == create_table)
|
|
{
|
|
call mtr.add_suppression("\\[ERROR\\] InnoDB: user stopword table not_defined does not exist.");
|
|
call mtr.add_suppression("\\[ERROR\\] InnoDB: user stopword table test/user_stopword_session does not exist.");
|
|
|
|
select * from information_schema.innodb_ft_default_stopword;
|
|
|
|
# Create FTS table
|
|
eval CREATE TABLE $stopword_table (
|
|
id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT (title,body)
|
|
)$create_options ENGINE=InnoDB;
|
|
|
|
# Insert six rows
|
|
eval INSERT INTO $stopword_table (title,body) VALUES
|
|
('MySQL Tutorial','DBMS stands for DataBase ...') ,
|
|
('How To Use MySQL Well','After you went through a ...'),
|
|
('Optimizing MySQL','In this tutorial we will show ...'),
|
|
('1001 MySQL Tricks','1. Never run mysqld as root. 2. ...'),
|
|
('MySQL vs. YourSQL','In the following database comparison ...'),
|
|
('MySQL Security','When configured properly, MySQL ...');
|
|
|
|
# "the" is in the default stopword, it would not be selected
|
|
eval SELECT * FROM $stopword_table WHERE MATCH (title,body)
|
|
AGAINST ('the' IN NATURAL LANGUAGE MODE);
|
|
|
|
# Provide user defined stopword table, if not (correctly) defined,
|
|
# it will be rejected
|
|
--error ER_WRONG_VALUE_FOR_VAR
|
|
set global innodb_ft_server_stopword_table = "not_defined";
|
|
set global innodb_ft_server_stopword_table = NULL;
|
|
|
|
# Define a correct formatted user stopword table
|
|
eval create table user_stopword(value varchar(30))$create_options engine = innodb;
|
|
|
|
# The set operation should be successful
|
|
set global innodb_ft_server_stopword_table = "test/user_stopword";
|
|
|
|
eval drop index title on $stopword_table;
|
|
|
|
eval create fulltext index idx on $stopword_table(title, body);
|
|
}
|
|
|
|
if ($stopword_stage == select_1)
|
|
{
|
|
--error 0, ER_INDEX_CORRUPT
|
|
eval SELECT * FROM $stopword_table WHERE MATCH (title,body)
|
|
AGAINST ('the' IN NATURAL LANGUAGE MODE);
|
|
--error 0, ER_INDEX_CORRUPT
|
|
eval SELECT * FROM $stopword_table WHERE MATCH (title,body)
|
|
AGAINST ('this' IN NATURAL LANGUAGE MODE);
|
|
|
|
}
|