mirror of
https://github.com/MariaDB/server.git
synced 2025-02-10 23:45:34 +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
192 lines
7.7 KiB
Text
192 lines
7.7 KiB
Text
--- stopword.result
|
|
+++ stopword,vers.reject
|
|
@@ -46,7 +46,7 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
INSERT INTO articles (title,body) VALUES
|
|
('MySQL Tutorial','DBMS stands for DataBase ...') ,
|
|
('How To Use MySQL Well','After you went through a ...'),
|
|
@@ -60,7 +60,7 @@
|
|
set global innodb_ft_server_stopword_table = "not_defined";
|
|
ERROR 42000: Variable 'innodb_ft_server_stopword_table' can't be set to the value of 'not_defined'
|
|
set global innodb_ft_server_stopword_table = NULL;
|
|
-create table user_stopword(value varchar(30)) engine = innodb;
|
|
+create table user_stopword(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
set global innodb_ft_server_stopword_table = "test/user_stopword";
|
|
drop index title on articles;
|
|
create fulltext index idx on articles(title, body);
|
|
@@ -73,7 +73,7 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
INSERT INTO articles_2 (title, body)
|
|
VALUES ('test for stopwords','this is it...');
|
|
SELECT * FROM articles_2 WHERE MATCH (title,body)
|
|
@@ -88,13 +88,13 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
INSERT INTO articles_3 (title, body)
|
|
VALUES ('test for stopwords','this is it...');
|
|
SELECT * FROM articles_3 WHERE MATCH (title,body)
|
|
AGAINST ('this' IN NATURAL LANGUAGE MODE);
|
|
id title body
|
|
-create table user_stopword_session(value varchar(30)) engine = innodb;
|
|
+create table user_stopword_session(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
insert into user_stopword values("this");
|
|
delete from user_stopword;
|
|
insert into user_stopword_session values("session");
|
|
@@ -104,7 +104,7 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
INSERT INTO articles_4 (title, body)
|
|
VALUES ('test for session stopwords','this should also be excluded...');
|
|
SELECT * FROM articles_4 WHERE MATCH (title,body)
|
|
@@ -120,7 +120,7 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
INSERT INTO articles_5 (title, body)
|
|
VALUES ('test for session stopwords','this should also be excluded...');
|
|
SELECT * FROM articles_5 WHERE MATCH (title,body)
|
|
@@ -142,7 +142,7 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT `idx` (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
SHOW CREATE TABLE articles;
|
|
Table Create Table
|
|
articles CREATE TABLE `articles` (
|
|
@@ -151,7 +151,7 @@
|
|
`body` text DEFAULT NULL,
|
|
PRIMARY KEY (`id`),
|
|
FULLTEXT KEY `idx` (`title`,`body`)
|
|
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
|
|
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING
|
|
INSERT INTO articles (title,body) VALUES
|
|
('MySQL from Tutorial','DBMS stands for DataBase ...') ,
|
|
('when To Use MySQL Well','After that you went through a ...'),
|
|
@@ -248,7 +248,7 @@
|
|
`title` varchar(200) DEFAULT NULL,
|
|
`body` text DEFAULT NULL,
|
|
PRIMARY KEY (`id`)
|
|
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
|
|
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING
|
|
ALTER TABLE articles ADD FULLTEXT INDEX idx (title,body);
|
|
ANALYZE TABLE articles;
|
|
Table Op Msg_type Msg_text
|
|
@@ -320,7 +320,7 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT `idx` (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
INSERT INTO articles (title,body) VALUES
|
|
('MySQL from Tutorial','DBMS stands for DataBase ...') ,
|
|
('when To Use MySQL Well','After that you went through a ...'),
|
|
@@ -332,9 +332,9 @@
|
|
id title body
|
|
SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will');
|
|
id title body
|
|
-create table user_stopword(value varchar(30)) engine = innodb;
|
|
+create table user_stopword(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
set session innodb_ft_user_stopword_table = "test/user_stopword";
|
|
-create table server_stopword(value varchar(30)) engine = innodb;
|
|
+create table server_stopword(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
set global innodb_ft_server_stopword_table = "test/server_stopword";
|
|
insert into user_stopword values("when"),("where");
|
|
delete from user_stopword;
|
|
@@ -419,7 +419,7 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT `idx` (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
SHOW CREATE TABLE articles;
|
|
Table Create Table
|
|
articles CREATE TABLE `articles` (
|
|
@@ -428,7 +428,7 @@
|
|
`body` text DEFAULT NULL,
|
|
PRIMARY KEY (`id`),
|
|
FULLTEXT KEY `idx` (`title`,`body`)
|
|
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
|
|
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING
|
|
INSERT INTO articles (title,body) VALUES
|
|
('MySQL from Tutorial','DBMS stands for DataBase ...') ,
|
|
('when To Use MySQL Well','After that you went through a ...'),
|
|
@@ -440,7 +440,7 @@
|
|
id title body
|
|
SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will');
|
|
id title body
|
|
-create table user_stopword(value varchar(30)) engine = innodb;
|
|
+create table user_stopword(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
set session innodb_ft_user_stopword_table = "test/user_stopword";
|
|
insert into user_stopword values("mysqld"),("DBMS");
|
|
SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+wha* +where" IN BOOLEAN MODE);
|
|
@@ -466,7 +466,7 @@
|
|
SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('mysqld');
|
|
id title body
|
|
set session innodb_ft_user_stopword_table = default;
|
|
-create table server_stopword(value varchar(30)) engine = innodb;
|
|
+create table server_stopword(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
set global innodb_ft_server_stopword_table = "test/server_stopword";
|
|
insert into server_stopword values("root"),("properly");
|
|
ALTER TABLE articles DROP INDEX idx;
|
|
@@ -530,7 +530,7 @@
|
|
title VARCHAR(200),
|
|
body TEXT,
|
|
FULLTEXT `idx` (title,body)
|
|
-) ENGINE=InnoDB;
|
|
+) WITH SYSTEM VERSIONING ENGINE=InnoDB;
|
|
SHOW CREATE TABLE articles;
|
|
Table Create Table
|
|
articles CREATE TABLE `articles` (
|
|
@@ -539,7 +539,7 @@
|
|
`body` text DEFAULT NULL,
|
|
PRIMARY KEY (`id`),
|
|
FULLTEXT KEY `idx` (`title`,`body`)
|
|
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
|
|
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING
|
|
INSERT INTO articles (title,body) VALUES
|
|
('MySQL from Tutorial','DBMS stands for DataBase ...') ,
|
|
('when To Use MySQL Well','After that you went through a ...'),
|
|
@@ -656,7 +656,7 @@
|
|
"In connection 1"
|
|
connection con1;
|
|
SET SESSION innodb_ft_enable_stopword = 1;
|
|
-create table user_stopword(value varchar(30)) engine = innodb;
|
|
+create table user_stopword(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
set session innodb_ft_user_stopword_table = "test/user_stopword";
|
|
insert into user_stopword values("this"),("will"),("the");
|
|
ALTER TABLE articles DROP INDEX idx;
|
|
@@ -674,7 +674,7 @@
|
|
select @@innodb_ft_user_stopword_table;
|
|
@@innodb_ft_user_stopword_table
|
|
NULL
|
|
-create table user_stopword_1(value varchar(30)) engine = innodb;
|
|
+create table user_stopword_1(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
set session innodb_ft_user_stopword_table = "test/user_stopword_1";
|
|
insert into user_stopword_1 values("when");
|
|
SET SESSION innodb_ft_enable_stopword = 1;
|
|
@@ -702,7 +702,7 @@
|
|
select @@innodb_ft_server_stopword_table;
|
|
@@innodb_ft_server_stopword_table
|
|
NULL
|
|
-create table server_stopword(value varchar(30)) engine = innodb;
|
|
+create table server_stopword(value varchar(30)) WITH SYSTEM VERSIONING engine = innodb;
|
|
SET GLOBAL innodb_ft_server_stopword_table = "test/server_stopword";
|
|
select @@innodb_ft_server_stopword_table;
|
|
@@innodb_ft_server_stopword_table
|