database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-35922 Server crashes in mhnsw_read_first upon using vector key with views

Browse Source
This commit is contained in:
Sergei Golubchik
2025-02-03 12:08:10 +01:00
parent 69041af67d
commit 6fc75e0868
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/main/vector_innodb.result
View File

@@ -273,4 +273,16 @@ drop table t;
create table t (v vector (1) not null,vector index (v)) engine=innodb; create table t (v vector (1) not null,vector index (v)) engine=innodb;
ERROR 42000: This table type requires a primary key ERROR 42000: This table type requires a primary key
set global innodb_force_primary_key=0; set global innodb_force_primary_key=0;
#
# MDEV-35922 Server crashes in mhnsw_read_first upon using vector key with views
#
create table t (pk int primary key, v vector(1) not null, vector(v)) engine=innodb;
insert into t values (1,0x31313131),(2,0x32323232);
create view v as select * from t;
select pk from v order by vec_distance_euclidean(v, 0x30303030) limit 2;
pk
1
2
drop view v;
drop table t;
# End of 11.7 tests # End of 11.7 tests

11
mysql-test/main/vector_innodb.test
View File

@@ -274,4 +274,15 @@ drop table t;
--error ER_REQUIRES_PRIMARY_KEY --error ER_REQUIRES_PRIMARY_KEY
create table t (v vector (1) not null,vector index (v)) engine=innodb; create table t (v vector (1) not null,vector index (v)) engine=innodb;
set global innodb_force_primary_key=0; set global innodb_force_primary_key=0;
--echo #
--echo # MDEV-35922 Server crashes in mhnsw_read_first upon using vector key with views
--echo #
create table t (pk int primary key, v vector(1) not null, vector(v)) engine=innodb;
insert into t values (1,0x31313131),(2,0x32323232);
create view v as select * from t;
select pk from v order by vec_distance_euclidean(v, 0x30303030) limit 2;
drop view v;
drop table t;
--echo # End of 11.7 tests --echo # End of 11.7 tests

4
sql/item_vectorfunc.h
View File

@@ -49,9 +49,9 @@ public:
double val_real() override; double val_real() override;
Item *get_const_arg() const Item *get_const_arg() const
{ {
if (args[0]->type() == Item::FIELD_ITEM && args[1]->const_item()) if (args[0]->real_item()->type() == Item::FIELD_ITEM && args[1]->const_item())
return args[1]; return args[1];
if (args[1]->type() == Item::FIELD_ITEM && args[0]->const_item()) if (args[1]->real_item()->type() == Item::FIELD_ITEM && args[0]->const_item())
return args[0]; return args[0];
return NULL; return NULL;
} }