mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +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
49 lines
1.3 KiB
Text
49 lines
1.3 KiB
Text
#
|
|
# Test of fulltext index
|
|
# bug reported by Tibor Simko <tibor.simko@cern.ch>
|
|
#
|
|
--source include/have_innodb.inc
|
|
--source include/maybe_versioning.inc
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1, t2;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (
|
|
id mediumint unsigned NOT NULL auto_increment,
|
|
tag char(6) NOT NULL default '',
|
|
value text NOT NULL default '',
|
|
PRIMARY KEY (id),
|
|
KEY kt(tag),
|
|
KEY kv(value(15)),
|
|
FULLTEXT KEY kvf(value)
|
|
) ENGINE = InnoDB;
|
|
|
|
CREATE TABLE t2 (
|
|
id_t2 mediumint unsigned NOT NULL default '0',
|
|
id_t1 mediumint unsigned NOT NULL default '0',
|
|
field_number tinyint unsigned NOT NULL default '0',
|
|
PRIMARY KEY (id_t2,id_t1,field_number),
|
|
KEY id_t1(id_t1)
|
|
) ENGINE = InnoDB;
|
|
|
|
INSERT INTO t1 (tag,value) VALUES ('foo123','bar111');
|
|
INSERT INTO t1 (tag,value) VALUES ('foo123','bar222');
|
|
INSERT INTO t1 (tag,value) VALUES ('bar345','baz333 ar');
|
|
|
|
INSERT INTO t2 VALUES (2231626,64280,0);
|
|
INSERT INTO t2 VALUES (2231626,64281,0);
|
|
INSERT INTO t2 VALUES (12346, 3, 1);
|
|
|
|
SELECT * FROM t1; SELECT * FROM t2;
|
|
|
|
SELECT DISTINCT t2.id_t2 FROM t2, t1
|
|
WHERE MATCH (t1.value) AGAINST ('baz333') AND t1.id = t2.id_t1;
|
|
|
|
SELECT DISTINCT t2.id_t2 FROM t2, t1
|
|
WHERE MATCH (t1.value) AGAINST ('baz333' IN BOOLEAN MODE)
|
|
AND t1.id = t2.id_t1;
|
|
|
|
DROP TABLE t1, t2;
|
|
|
|
# End of 4.1 tests
|