MDEV-35768 Vector key is not used upon selecting from views / subqueries

Author: vuvova

mysql-test/main/vector2.result

@@ -369,3 +369,21 @@ vec_totext(v)
 [7]
 [6]
 drop table t;
+#
+# MDEV-35768 Vector key is not used upon selecting from views / subqueries
+#
+create table t (b vector(1) not null, vector(b));
+insert into t values (0x31313131),(0x32323232);
+create view v as select * from t;
+explain select * from t order by vec_distance_euclidean(b,0x30303030) limit 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	b	6	NULL	1	
+explain select * from v order by vec_distance_euclidean(b,0x30303030) limit 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	b	6	NULL	1	
+explain select * from (select * from t) sq order by vec_distance_euclidean(b,0x30303030) limit 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	b	6	NULL	1	
+drop view v;
+drop table t;
+# End of 11.7 tests

mysql-test/main/vector2.test

@@ -265,3 +265,18 @@ create table t (v vector(1) not null, vector(v));
 insert into t select vec_fromtext(concat('[',seq,']')) FROM seq_1_to_10;
 select vec_totext(v) from t order by vec_distance_euclidean(v,vec_fromtext('[0]')) desc limit 5;
 drop table t;
+
+--echo #
+--echo # MDEV-35768 Vector key is not used upon selecting from views / subqueries
+--echo #
+
+create table t (b vector(1) not null, vector(b));
+insert into t values (0x31313131),(0x32323232);
+create view v as select * from t;
+explain select * from t order by vec_distance_euclidean(b,0x30303030) limit 1;
+explain select * from v order by vec_distance_euclidean(b,0x30303030) limit 1;
+explain select * from (select * from t) sq order by vec_distance_euclidean(b,0x30303030) limit 1;
+drop view v;
+drop table t;
+
+--echo # End of 11.7 tests

sql/item_vectorfunc.h

@@ -26,10 +26,10 @@ class Item_func_vec_distance_common: public Item_real_func
 {
   Item_field *get_field_arg() const
   {
-    if (args[0]->type() == Item::FIELD_ITEM && args[1]->const_item())
-      return (Item_field*)(args[0]);
-    if (args[1]->type() == Item::FIELD_ITEM && args[0]->const_item())
-      return (Item_field*)(args[1]);
+    if (args[0]->real_item()->type() == Item::FIELD_ITEM && args[1]->const_item())
+      return (Item_field*)(args[0]->real_item());
+    if (args[1]->real_item()->type() == Item::FIELD_ITEM && args[0]->const_item())
+      return (Item_field*)(args[1])->real_item();
     return NULL;
   }
   bool check_arguments() const override