database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

MDEV-35082 HANDLER with FULLTEXT keys is not always rejected

Browse Source 
need to check for index capabilities also for HANDLER READ NEXT
This commit is contained in:
Sergei Golubchik
2024-10-06 17:41:07 +02:00
parent 23d7dc1ea1
commit 4281e0068b
7 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/suite/handler/interface.result
View File

@ -338,9 +338,9 @@ CREATE TABLE t1 (g GEOMETRY NOT NULL, SPATIAL gi(g));
INSERT INTO t1 VALUES (POINT(0,0));
HANDLER t1 OPEN AS h;
HANDLER h READ `gi`= (10);
ERROR HY000: SPATIAL index `gi` does not support this operation
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
HANDLER h READ `gi`> (10);
ERROR HY000: SPATIAL index `gi` does not support this operation
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
HANDLER h CLOSE;
DROP TABLE t1;
CREATE TABLE t1 (w VARCHAR(100), FULLTEXT fk(w));
@ -352,3 +352,12 @@ HANDLER h READ `fk`> (10);
ERROR HY000: FULLTEXT index `fk` does not support this operation
HANDLER h CLOSE;
DROP TABLE t1;
#
# MDEV-35082 HANDLER with FULLTEXT keys is not always rejected
#
create table t (a int primary key, v text not null, fulltext(v));
handler t open;
handler t read v next;
ERROR HY000: FULLTEXT index `v` does not support this operation
drop table t;
# End of 10.5 tests

15
mysql-test/suite/handler/interface.test
View File

@ -385,9 +385,9 @@ DROP TABLE t1;
CREATE TABLE t1 (g GEOMETRY NOT NULL, SPATIAL gi(g));
INSERT INTO t1 VALUES (POINT(0,0));
HANDLER t1 OPEN AS h;
--error ER_KEY_DOESNT_SUPPORT
--error ER_CANT_CREATE_GEOMETRY_OBJECT
HANDLER h READ `gi`= (10);
--error ER_KEY_DOESNT_SUPPORT
--error ER_CANT_CREATE_GEOMETRY_OBJECT
HANDLER h READ `gi`> (10);
HANDLER h CLOSE;
DROP TABLE t1;
@ -401,3 +401,14 @@ HANDLER h READ `fk`= (10);
HANDLER h READ `fk`> (10);
HANDLER h CLOSE;
DROP TABLE t1;
--echo #
--echo # MDEV-35082 HANDLER with FULLTEXT keys is not always rejected
--echo #
create table t (a int primary key, v text not null, fulltext(v));
handler t open;
--error ER_KEY_DOESNT_SUPPORT
handler t read v next;
drop table t;
--echo # End of 10.5 tests

4
mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
View File

@ -1188,9 +1188,9 @@ DROP TABLE t;
CREATE TABLE t(a CHAR(1),FULLTEXT KEY(a)) ENGINE=INNODB;
HANDLER t OPEN;
HANDLER t READ a NEXT;
a
ERROR HY000: FULLTEXT index `a` does not support this operation
HANDLER t READ a PREV;
a
ERROR HY000: FULLTEXT index `a` does not support this operation
DROP TABLE t;
CREATE TABLE `%`(a TEXT, FULLTEXT INDEX(a)) ENGINE=INNODB;
CREATE TABLE `A B`(a TEXT, FULLTEXT INDEX(a)) ENGINE=INNODB;

4
mysql-test/suite/innodb_fts/r/misc.result
View File

@ -1183,9 +1183,9 @@ DROP TABLE t;
CREATE TABLE t(a CHAR(1),FULLTEXT KEY(a)) ENGINE=INNODB;
HANDLER t OPEN;
HANDLER t READ a NEXT;
a
ERROR HY000: FULLTEXT index `a` does not support this operation
HANDLER t READ a PREV;
a
ERROR HY000: FULLTEXT index `a` does not support this operation
DROP TABLE t;
CREATE TABLE `%`(a TEXT, FULLTEXT INDEX(a)) ENGINE=INNODB;
CREATE TABLE `A B`(a TEXT, FULLTEXT INDEX(a)) ENGINE=INNODB;

2
mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
View File

@ -1155,7 +1155,9 @@ DROP TABLE t;
# InnoDB FTS does not support index scan from handler
CREATE TABLE t(a CHAR(1),FULLTEXT KEY(a)) ENGINE=INNODB;
HANDLER t OPEN;
--error ER_KEY_DOESNT_SUPPORT
HANDLER t READ a NEXT;
--error ER_KEY_DOESNT_SUPPORT
HANDLER t READ a PREV;
DROP TABLE t;

2
mysql-test/suite/innodb_fts/t/misc.test
View File

@ -1148,7 +1148,9 @@ DROP TABLE t;
# InnoDB FTS does not support index scan from handler
CREATE TABLE t(a CHAR(1),FULLTEXT KEY(a)) ENGINE=INNODB;
HANDLER t OPEN;
--error ER_KEY_DOESNT_SUPPORT
HANDLER t READ a NEXT;
--error ER_KEY_DOESNT_SUPPORT
HANDLER t READ a PREV;
DROP TABLE t;

24
sql/sql_handler.cc
View File

@ -647,28 +647,26 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler,
}
}
const KEY *c_key= table->s->key_info + handler->keyno;
if (c_key->algorithm == HA_KEY_ALG_FULLTEXT ||
(ha_rkey_mode != HA_READ_KEY_EXACT &&
(table->file->index_flags(handler->keyno, 0, TRUE) &
(HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE)) == 0))
{
my_error(ER_KEY_DOESNT_SUPPORT, MYF(0),
table->file->index_type(handler->keyno), c_key->name.str);
return 1;
}
/* Check key parts */
if (mode == RKEY)
{
TABLE *table= handler->table;
KEY *keyinfo= table->key_info + handler->keyno;
KEY_PART_INFO *key_part= keyinfo->key_part;
List_iterator<Item> it_ke(*key_expr);
Item *item;
key_part_map keypart_map;
uint key_len;
const KEY *c_key= table->s->key_info + handler->keyno;
if ((c_key->flags & HA_SPATIAL) ||
c_key->algorithm == HA_KEY_ALG_FULLTEXT ||
(ha_rkey_mode != HA_READ_KEY_EXACT &&
(table->file->index_flags(handler->keyno, 0, TRUE) &
(HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE)) == 0))
{
my_error(ER_KEY_DOESNT_SUPPORT, MYF(0),
table->file->index_type(handler->keyno), keyinfo->name.str);
return 1;
}
if (key_expr->elements > keyinfo->user_defined_key_parts)
{