MDEV-33408 Introduce session variables to manage HNSW index parameters

config.h.cmake

@@ -501,14 +501,6 @@
 #cmakedefine HAVE_EncryptAes128Gcm 1
 #cmakedefine HAVE_hkdf 1
 
-/*
- Stuff that always need to be defined (compile breaks without it)
-*/
-#define HAVE_SPATIAL 1
-#define HAVE_RTREE_KEYS 1
-#define HAVE_QUERY_CACHE 1
-#define BIG_TABLES 1
-
 /*
  Important storage engines (those that really need define 
  WITH_<ENGINE>_STORAGE_ENGINE for the whole server)

include/m_string.h

@@ -233,12 +233,6 @@ static inline void lex_string_set(LEX_CSTRING *lex_str, const char *c_str)
  lex_str->str= c_str;
  lex_str->length= strlen(c_str);
 }
-static inline void lex_string_set3(LEX_CSTRING *lex_str, const char *c_str,
- size_t len)
-{
- lex_str->str= c_str;
- lex_str->length= len;
-}
 
 /*
  Copies src into dst and ensures dst is a NULL terminated C string.

include/my_base.h

@@ -97,16 +97,18 @@ enum ha_rkey_function {
  HA_READ_MBR_EQUAL
 };
 
- /* Key algorithm types */
+/* Key algorithm types (stored in .frm) */
 
 enum ha_key_alg {
- HA_KEY_ALG_UNDEF= 0, /* Not specified (old file) */
- HA_KEY_ALG_BTREE= 1, /* B-tree, default one */
- HA_KEY_ALG_RTREE= 2, /* R-tree, for spatial searches */
- HA_KEY_ALG_HASH= 3, /* HASH keys (HEAP tables) */
- HA_KEY_ALG_FULLTEXT= 4, /* FULLTEXT (MyISAM tables) */
- HA_KEY_ALG_LONG_HASH= 5, /* long BLOB keys */
- HA_KEY_ALG_UNIQUE_HASH= 6 /* Internal UNIQUE hash (Aria) */
+ HA_KEY_ALG_UNDEF= 0, /* Not specified. Practically the
+ key will be B-tree or hash */
+ HA_KEY_ALG_BTREE= 1, /* B-tree, default one */
+ HA_KEY_ALG_RTREE= 2, /* R-tree, for spatial searches */
+ HA_KEY_ALG_HASH= 3, /* HASH keys (HEAP tables) */
+ HA_KEY_ALG_FULLTEXT= 4, /* FULLTEXT */
+ HA_KEY_ALG_LONG_HASH= 5, /* long BLOB keys */
+ HA_KEY_ALG_UNIQUE_HASH= 6, /* Internal UNIQUE hash (Aria) */
+ HA_KEY_ALG_MHNSW= 7 /* HNSW for k-ANN vector search */
 };
 
  /* Storage media types */ 
@@ -267,51 +269,49 @@ enum ha_base_keytype {
  Note that these can only be up to 16 bits!
 */
 
-#define HA_NOSAME 1U /* Set if not dupplicated records */
-#define HA_PACK_KEY 2U /* Pack string key to previous key */
-#define HA_AUTO_KEY 16U /* MEMORY/MyISAM/Aria internal */
-#define HA_BINARY_PACK_KEY 32U /* Packing of all keys to prev key */
-#define HA_FULLTEXT 128U /* For full-text search */
-#define HA_SPATIAL 1024U /* For spatial search */
-#define HA_NULL_ARE_EQUAL 2048U /* NULL in key are cmp as equal */
-#define HA_GENERATED_KEY 8192U /* Automatically generated key */
-/* 
- Part of unique hash key. Used only for temporary (work) tables so is not
- written to .frm files.
-*/
-#define HA_UNIQUE_HASH 262144U
-
- /* The combination of the above can be used for key type comparison. */
-#define HA_KEYFLAG_MASK (HA_NOSAME | HA_AUTO_KEY | \
- HA_FULLTEXT | \
- HA_SPATIAL | HA_NULL_ARE_EQUAL | HA_GENERATED_KEY | \
- HA_UNIQUE_HASH)
+#define HA_NOSAME 1U /* Set if not dupplicated records */
+#define HA_PACK_KEY 2U /* Pack string key to previous key */
+#define HA_SPACE_PACK_USED 4U /* Test for if SPACE_PACK used */
+#define HA_VAR_LENGTH_KEY 8U /* automatic bit */
+#define HA_AUTO_KEY 16U /* MEMORY/MyISAM/Aria internal */
+#define HA_BINARY_PACK_KEY 32U /* Packing of all keys to prev key */
+#define HA_NULL_PART_KEY 64U /* automatic bit */
+#define HA_FULLTEXT_legacy 128U /* For full-text search */
+#define HA_SORT_ALLOWS_SAME 512U /* Intern bit when sorting records */
+#define HA_SPATIAL_legacy 1024U /* For spatial search */
+#define HA_NULL_ARE_EQUAL 2048U /* NULL in key are cmp as equal */
+#define HA_USES_COMMENT 4096U /* automatic bit */
+#define HA_GENERATED_KEY 8192U /* Automatically generated key */
+#define HA_USES_PARSER 16384U /* Fulltext index uses [pre]parser */
+#define HA_USES_BLOCK_SIZE 32768U /* automatic bit */
 
 /*
  Key contains partial segments.
 
  This flag is internal to the MySQL server by design. It is not supposed
  neither to be saved in FRM-files, nor to be passed to storage engines.
- It is intended to pass information into internal static sort_keys(KEY *,
- KEY *) function.
+ It is intended to pass information into internal sort_keys(KEY *, KEY *)
+ function.
 
  This flag can be calculated -- it's based on key lengths comparison.
 */
-#define HA_KEY_HAS_PART_KEY_SEG 65536
-/* Internal Flag Can be calculated */
-#define HA_INVISIBLE_KEY 2<<18
- /* Automatic bits in key-flag */
-
-#define HA_SPACE_PACK_USED 4 /* Test for if SPACE_PACK used */
-#define HA_VAR_LENGTH_KEY 8
-#define HA_NULL_PART_KEY 64
-#define HA_USES_COMMENT 4096
-#define HA_USES_PARSER 16384 /* Fulltext index uses [pre]parser */
-#define HA_USES_BLOCK_SIZE ((uint) 32768)
-#define HA_SORT_ALLOWS_SAME 512 /* Intern bit when sorting records */
+#define HA_KEY_HAS_PART_KEY_SEG 65536U
 
 /* This flag can be used only in KEY::ext_key_flags */
-#define HA_EXT_NOSAME 131072
+#define HA_EXT_NOSAME 131072U
+
+/*
+ Part of unique hash key. Used only for temporary (work) tables so is not
+ written to .frm files.
+*/
+#define HA_UNIQUE_HASH 262144U
+
+/* Internal Flag Can be calculated */
+#define HA_INVISIBLE_KEY (2<<18)
+
+/* The combination of the above can be used for key type comparison. */
+#define HA_KEYFLAG_MASK (HA_NOSAME | HA_AUTO_KEY | HA_NULL_ARE_EQUAL | \
+ HA_GENERATED_KEY | HA_UNIQUE_HASH)
 
  /* These flags can be added to key-seg-flag */
 
@@ -666,13 +666,8 @@ typedef struct st_page_range
 #define unused_page_range { UNUSED_PAGE_NO, UNUSED_PAGE_NO }
 
 /* For number of records */
-#ifdef BIG_TABLES
 #define rows2double(A) ulonglong2double(A)
 typedef my_off_t ha_rows;
-#else
-#define rows2double(A) (double) (A)
-typedef ulong ha_rows;
-#endif
 
 #define HA_POS_ERROR (~ (ha_rows) 0)
 #define HA_OFFSET_ERROR (~ (my_off_t) 0)

include/myisampack.h

@@ -234,14 +234,8 @@
 
 /* Fix to avoid warnings when sizeof(ha_rows) == sizeof(long) */
 
-#ifdef BIG_TABLES
 #define mi_rowstore(T,A) mi_int8store(T, A)
 #define mi_rowkorr(T) mi_uint8korr(T)
-#else
-#define mi_rowstore(T,A) { mi_int4store(T, 0);\
- mi_int4store(((uchar*) (T) + 4), A); }
-#define mi_rowkorr(T) mi_uint4korr((const uchar*) (T) + 4)
-#endif
 
 #if SIZEOF_OFF_T > 4
 #define mi_sizestore(T,A) mi_int8store(T, A)

include/mysql.h

@@ -143,6 +143,8 @@ typedef unsigned long long my_ulonglong;
 #define ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS ER_UNSUPPORTED_ENGINE_FOR_GENERATED_COLUMNS
 #define ER_KEY_COLUMN_DOES_NOT_EXITS ER_KEY_COLUMN_DOES_NOT_EXIST
 #define ER_DROP_PARTITION_NON_EXISTENT ER_PARTITION_DOES_NOT_EXIST
+#define ER_SPATIAL_CANT_HAVE_NULL ER_INDEX_CANNOT_HAVE_NULL
+#define ER_INNODB_NO_FT_TEMP_TABLE ER_NO_INDEX_ON_TEMPORARY
 
 typedef struct st_mysql_rows {
  struct st_mysql_rows *next; /* list of rows */

include/queues.h

@@ -76,7 +76,7 @@ uchar *queue_remove(QUEUE *queue,uint idx);
 void queue_replace(QUEUE *queue,uint idx);
 
 #define queue_remove_all(queue) { (queue)->elements= 0; }
-#define queue_is_full(queue) (queue->elements == queue->max_elements)
+#define queue_is_full(queue) ((queue)->elements == (queue)->max_elements)
 void _downheap(QUEUE *queue, uint idx);
 void queue_fix(QUEUE *queue);
 #define is_queue_inited(queue) ((queue)->root != 0)

libmysqld/emb_qcache.cc

@@ -16,7 +16,6 @@
 #include "mariadb.h"
 #include "sql_priv.h"
 
-#ifdef HAVE_QUERY_CACHE
 #include <mysql.h>
 #include "sql_basic_types.h"
 #include "emb_qcache.h"
@@ -497,6 +496,3 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
 err:
  DBUG_RETURN(1);
 }
-
-#endif /*HAVE_QUERY_CACHE*/
-

mysql-test/main/alter_table.result

@@ -833,8 +833,6 @@ ERROR HY000: Incorrect prefix key; the used key part isn't a string, the used le
 ALTER TABLE t1 ADD d INT;
 ALTER TABLE t1 ADD KEY (d(20));
 ERROR HY000: Incorrect prefix key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique prefix keys
-ALTER TABLE t1 ADD e GEOMETRY NOT NULL, ADD SPATIAL KEY (e(30));
-ERROR HY000: Incorrect prefix key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique prefix keys
 DROP TABLE t1;
 CREATE TABLE t1 (s CHAR(8) BINARY);
 INSERT INTO t1 VALUES ('test');

mysql-test/main/alter_table.test

@@ -705,10 +705,6 @@ ALTER TABLE t1 ADD d INT;
 --error ER_WRONG_SUB_KEY
 ALTER TABLE t1 ADD KEY (d(20));
 
-# the 5.1 part of the test
---error ER_WRONG_SUB_KEY
-ALTER TABLE t1 ADD e GEOMETRY NOT NULL, ADD SPATIAL KEY (e(30));
-
 DROP TABLE t1;
 
 #

mysql-test/main/features.result

@@ -176,7 +176,7 @@ create table t2 (b int, constraint foo check (b < 10));
 drop table t1, t2;
 show status like "feature_check_constraint";
 Variable_name Value
-Feature_check_constraint 2
+Feature_check_constraint 4
 #
 # Feature insert...returning
 #

mysql-test/main/gis-rtree.result

@@ -1,3 +1,29 @@
+create table t1 (g geometry not null, spatial key(g(10)));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(10)))' at line 1
+create table t1 (g geometry not null, spatial key(g asc));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asc))' at line 1
+create table t1 (g geometry not null, spatial key(g desc));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'desc))' at line 1
+create table t1 (g geometry not null, f geometry not null, spatial key(g,f));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'f))' at line 1
+create table t1 (g geometry not null, f geometry not null);
+create spatial index bad on t1 (g(10));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(10))' at line 1
+create spatial index bad on t1 (g asc);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asc)' at line 1
+create spatial index bad on t1 (g desc);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'desc)' at line 1
+create spatial index bad on t1 (f,g);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'g)' at line 1
+alter table t1 add spatial index bad (g(10));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(10))' at line 1
+alter table t1 add spatial index bad (g asc);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asc)' at line 1
+alter table t1 add spatial index bad (g desc);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'desc)' at line 1
+alter table t1 add spatial index bad (f,g);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'g)' at line 1
+drop table t1;
 CREATE TABLE t1 (
 fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 g GEOMETRY NOT NULL,

mysql-test/main/gis-rtree.test

@@ -1,5 +1,38 @@
 -- source include/have_geometry.inc
 
+#
+# invalid index specifications
+#
+--error ER_PARSE_ERROR
+create table t1 (g geometry not null, spatial key(g(10)));
+--error ER_PARSE_ERROR
+create table t1 (g geometry not null, spatial key(g asc));
+--error ER_PARSE_ERROR
+create table t1 (g geometry not null, spatial key(g desc));
+--error ER_PARSE_ERROR
+create table t1 (g geometry not null, f geometry not null, spatial key(g,f));
+
+create table t1 (g geometry not null, f geometry not null);
+--error ER_PARSE_ERROR
+create spatial index bad on t1 (g(10));
+--error ER_PARSE_ERROR
+create spatial index bad on t1 (g asc);
+--error ER_PARSE_ERROR
+create spatial index bad on t1 (g desc);
+--error ER_PARSE_ERROR
+create spatial index bad on t1 (f,g);
+
+--error ER_PARSE_ERROR
+alter table t1 add spatial index bad (g(10));
+--error ER_PARSE_ERROR
+alter table t1 add spatial index bad (g asc);
+--error ER_PARSE_ERROR
+alter table t1 add spatial index bad (g desc);
+--error ER_PARSE_ERROR
+alter table t1 add spatial index bad (f,g);
+
+drop table t1;
+
 #
 # test of rtree (using with spatial data)
 #

mysql-test/main/gis.result

@@ -1098,15 +1098,6 @@ col0 INTEGER NOT NULL,
 col1 POINT,
 col2 POINT
 );
-CREATE SPATIAL INDEX idx0 ON t2 (col1, col2);
-ERROR HY000: Incorrect arguments to SPATIAL INDEX
-CREATE TABLE t3 (
-col0 INTEGER NOT NULL,
-col1 POINT,
-col2 LINESTRING,
-SPATIAL INDEX i1 (col1, col2)
-);
-ERROR HY000: Incorrect arguments to SPATIAL INDEX
 DROP TABLE t0, t1, t2;
 #
 # BUG#12414917 - ISCLOSED() CRASHES ON 64-BIT BUILDS

mysql-test/main/gis.test

@@ -826,17 +826,6 @@ CREATE TABLE t2 (
  col2 POINT
 );
 
---error ER_WRONG_ARGUMENTS
-CREATE SPATIAL INDEX idx0 ON t2 (col1, col2);
-
---error ER_WRONG_ARGUMENTS
-CREATE TABLE t3 (
- col0 INTEGER NOT NULL,
- col1 POINT,
- col2 LINESTRING,
- SPATIAL INDEX i1 (col1, col2)
-);
-
 # cleanup
 DROP TABLE t0, t1, t2;
 

mysql-test/main/invisible_field.result

@@ -444,7 +444,7 @@ d int(11) YES UNI NULL
 drop table t1;
 SHOW STATUS LIKE 'Feature_invisible_columns';
 Variable_name Value
-Feature_invisible_columns 52
+Feature_invisible_columns 54
 #invisible is non reserved
 create table t1(a int unique , invisible int invisible, c int );
 desc t1;

mysql-test/main/myisam.result

@@ -454,9 +454,6 @@ select * from t1 where a='807780' and b='477' and c='165';
 a b c
 807780 477 165
 drop table t1;
-DROP TABLE IF EXISTS t1;
-Warnings:
-Note 1051 Unknown table 'test.t1'
 CREATE TABLE t1 (a varchar(150) NOT NULL, KEY (a));
 INSERT t1 VALUES ("can \tcan");
 INSERT t1 VALUES ("can can");
@@ -579,7 +576,7 @@ t1c1 t2c1
 UNLOCK TABLES;
 DROP TABLE t1,t2;
 CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
-Got one of the listed errors
+ERROR HY000: Incorrect arguments to RTREE INDEX
 create table t1 (a int, b varchar(200), c text not null) checksum=1;
 create table t2 (a int, b varchar(200), c text not null) checksum=0;
 insert t1 values (1, "aaa", "bbb"), (NULL, "", "ccccc"), (0, NULL, "");

mysql-test/main/myisam.test

@@ -438,7 +438,6 @@ drop table t1;
 #
 # space-stripping in _mi_prefix_search: BUG#5284
 #
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a varchar(150) NOT NULL, KEY (a)); 
 INSERT t1 VALUES ("can \tcan"); 
 INSERT t1 VALUES ("can can"); 
@@ -543,7 +542,7 @@ DROP TABLE t1,t2;
 #
 # Test RTREE index
 #
---error 1235, 1289
+--error ER_WRONG_ARGUMENTS
 CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
 # INSERT INTO t1 VALUES (1,1),(1,1);
 # DELETE FROM rt WHERE a<1;
@@ -1129,7 +1128,7 @@ drop table t1;
 create table t1 (c1 int) engine=myisam pack_keys=0;
 create table t2 (c1 int) engine=myisam pack_keys=1;
 create table t3 (c1 int) engine=myisam pack_keys=default;
---error 1064
+--error ER_PARSE_ERROR
 create table t4 (c1 int) engine=myisam pack_keys=2;
 drop table t1, t2, t3;
 
@@ -1316,9 +1315,9 @@ create table t1 (a int not null, key `a` (a) key_block_size=1025);
 show create table t1;
 drop table t1;
 
---error 1064
+--error ER_PARSE_ERROR
 create table t1 (a int not null, key key_block_size=1024 (a));
---error 1064
+--error ER_PARSE_ERROR
 create table t1 (a int not null, key `a` key_block_size=1024 (a));
 
 #