MDEV-25129 Add KEYWORDS view to the INFORMATION_SCHEMA

Add KEYWORDS table and SQL_FUNCTIONS table to INFORMATION_SCHEMA. This commits needs some minor changes when propagated upwards (e.g. func_array in item_create.cc has a termination element that doesn't exist in later versions of MariaDB)
MariaDB · Jun 29, 2021 · 768c518 · 768c518
1 parent 58252ff
commit 768c518
Show file tree

Hide file tree

Showing 12 changed files with 306 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -517,3 +517,5 @@ compile_commands.json
 
 # Visual Studio Code workspace
 .vscode/
+
+.cache/clangd
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
@@ -65,6 +65,7 @@ GEOMETRY_COLUMNS
 GLOBAL_STATUS
 GLOBAL_VARIABLES
 INDEX_STATISTICS
+KEYWORDS
 KEY_CACHES
 KEY_COLUMN_USAGE
 PARAMETERS
@@ -79,6 +80,7 @@ SCHEMA_PRIVILEGES
 SESSION_STATUS
 SESSION_VARIABLES
 SPATIAL_REF_SYS
+SQL_FUNCTIONS
 STATISTICS
 SYSTEM_VARIABLES
 TABLES

diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result
@@ -41,6 +41,7 @@ INNODB_SYS_VIRTUAL
 INNODB_TABLESPACES_ENCRYPTION
 INNODB_TABLESPACES_SCRUBBING
 INNODB_TRX
+KEYWORDS
 KEY_CACHES
 KEY_COLUMN_USAGE
 PARAMETERS
@@ -55,6 +56,7 @@ SCHEMA_PRIVILEGES
 SESSION_STATUS
 SESSION_VARIABLES
 SPATIAL_REF_SYS
+SQL_FUNCTIONS
 STATISTICS
 SYSTEM_VARIABLES
 TABLES
@@ -121,6 +123,7 @@ INNODB_SYS_VIRTUAL	TABLE_ID
 INNODB_TABLESPACES_ENCRYPTION	SPACE
 INNODB_TABLESPACES_SCRUBBING	SPACE
 INNODB_TRX	trx_id
+KEYWORDS	WORD
 KEY_CACHES	KEY_CACHE_NAME
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
 PARAMETERS	SPECIFIC_SCHEMA
@@ -135,6 +138,7 @@ SCHEMA_PRIVILEGES	TABLE_SCHEMA
 SESSION_STATUS	VARIABLE_NAME
 SESSION_VARIABLES	VARIABLE_NAME
 SPATIAL_REF_SYS	SRID
+SQL_FUNCTIONS	FUNCTION
 STATISTICS	TABLE_SCHEMA
 SYSTEM_VARIABLES	VARIABLE_NAME
 TABLES	TABLE_SCHEMA
@@ -201,6 +205,7 @@ INNODB_SYS_VIRTUAL	TABLE_ID
 INNODB_TABLESPACES_ENCRYPTION	SPACE
 INNODB_TABLESPACES_SCRUBBING	SPACE
 INNODB_TRX	trx_id
+KEYWORDS	WORD
 KEY_CACHES	KEY_CACHE_NAME
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
 PARAMETERS	SPECIFIC_SCHEMA
@@ -215,6 +220,7 @@ SCHEMA_PRIVILEGES	TABLE_SCHEMA
 SESSION_STATUS	VARIABLE_NAME
 SESSION_VARIABLES	VARIABLE_NAME
 SPATIAL_REF_SYS	SRID
+SQL_FUNCTIONS	FUNCTION
 STATISTICS	TABLE_SCHEMA
 SYSTEM_VARIABLES	VARIABLE_NAME
 TABLES	TABLE_SCHEMA
@@ -356,6 +362,7 @@ Database: information_schema
 | INNODB_TABLESPACES_ENCRYPTION         |
 | INNODB_TABLESPACES_SCRUBBING          |
 | INNODB_TRX                            |
+| KEYWORDS                              |
 | KEY_CACHES                            |
 | KEY_COLUMN_USAGE                      |
 | PARAMETERS                            |
@@ -370,6 +377,7 @@ Database: information_schema
 | SESSION_STATUS                        |
 | SESSION_VARIABLES                     |
 | SPATIAL_REF_SYS                       |
+| SQL_FUNCTIONS                         |
 | STATISTICS                            |
 | SYSTEM_VARIABLES                      |
 | TABLES                                |
@@ -426,6 +434,7 @@ Database: INFORMATION_SCHEMA
 | INNODB_TABLESPACES_ENCRYPTION         |
 | INNODB_TABLESPACES_SCRUBBING          |
 | INNODB_TRX                            |
+| KEYWORDS                              |
 | KEY_CACHES                            |
 | KEY_COLUMN_USAGE                      |
 | PARAMETERS                            |
@@ -440,6 +449,7 @@ Database: INFORMATION_SCHEMA
 | SESSION_STATUS                        |
 | SESSION_VARIABLES                     |
 | SPATIAL_REF_SYS                       |
+| SQL_FUNCTIONS                         |
 | STATISTICS                            |
 | SYSTEM_VARIABLES                      |
 | TABLES                                |
@@ -459,5 +469,5 @@ Wildcard: inf_rmation_schema
 | information_schema |
 SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
-information_schema	65
+information_schema	67
 mysql	30
diff --git a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result
@@ -181,6 +181,7 @@ def	information_schema	INDEX_STATISTICS	INDEX_NAME	3	''	NO	varchar	192	576	NULL
 def	information_schema	INDEX_STATISTICS	ROWS_READ	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
 def	information_schema	INDEX_STATISTICS	TABLE_NAME	2	''	NO	varchar	192	576	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select		NEVER	NULL
 def	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	1	''	NO	varchar	192	576	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select		NEVER	NULL
+def	information_schema	KEYWORDS	WORD	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	KEY_CACHES	BLOCK_SIZE	5	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	KEY_CACHES	DIRTY_BLOCKS	8	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
 def	information_schema	KEY_CACHES	FULL_SIZE	4	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select		NEVER	NULL
@@ -336,6 +337,7 @@ def	information_schema	SPATIAL_REF_SYS	AUTH_NAME	2	''	NO	varchar	512	1536	NULL	N
 def	information_schema	SPATIAL_REF_SYS	AUTH_SRID	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(5)			select		NEVER	NULL
 def	information_schema	SPATIAL_REF_SYS	SRID	1	0	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)			select		NEVER	NULL
 def	information_schema	SPATIAL_REF_SYS	SRTEXT	4	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(2048)			select		NEVER	NULL
+def	information_schema	SQL_FUNCTIONS	FUNCTION	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select		NEVER	NULL
 def	information_schema	STATISTICS	CARDINALITY	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select		NEVER	NULL
 def	information_schema	STATISTICS	COLLATION	9	NULL	YES	varchar	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1)			select		NEVER	NULL
 def	information_schema	STATISTICS	COLUMN_NAME	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select		NEVER	NULL
@@ -716,6 +718,7 @@ NULL	information_schema	GEOMETRY_COLUMNS	SRID	smallint	NULL	NULL	NULL	NULL	small
 3.0000	information_schema	INDEX_STATISTICS	TABLE_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 3.0000	information_schema	INDEX_STATISTICS	INDEX_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 NULL	information_schema	INDEX_STATISTICS	ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
+3.0000	information_schema	KEYWORDS	WORD	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_CACHES	KEY_CACHE_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 NULL	information_schema	KEY_CACHES	SEGMENTS	int	NULL	NULL	NULL	NULL	int(3) unsigned
 NULL	information_schema	KEY_CACHES	SEGMENT_NUMBER	int	NULL	NULL	NULL	NULL	int(3) unsigned
@@ -871,6 +874,7 @@ NULL	information_schema	SPATIAL_REF_SYS	SRID	smallint	NULL	NULL	NULL	NULL	smalli
 3.0000	information_schema	SPATIAL_REF_SYS	AUTH_NAME	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 NULL	information_schema	SPATIAL_REF_SYS	AUTH_SRID	int	NULL	NULL	NULL	NULL	int(5)
 3.0000	information_schema	SPATIAL_REF_SYS	SRTEXT	varchar	2048	6144	utf8	utf8_general_ci	varchar(2048)
+3.0000	information_schema	SQL_FUNCTIONS	FUNCTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)

diff --git a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
@@ -181,6 +181,7 @@ def	information_schema	INDEX_STATISTICS	INDEX_NAME	3	''	NO	varchar	192	576	NULL
 def	information_schema	INDEX_STATISTICS	ROWS_READ	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
 def	information_schema	INDEX_STATISTICS	TABLE_NAME	2	''	NO	varchar	192	576	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(192)					NEVER	NULL
 def	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	1	''	NO	varchar	192	576	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(192)					NEVER	NULL
+def	information_schema	KEYWORDS	WORD	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	KEY_CACHES	BLOCK_SIZE	5	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	KEY_CACHES	DIRTY_BLOCKS	8	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
 def	information_schema	KEY_CACHES	FULL_SIZE	4	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned					NEVER	NULL
@@ -336,6 +337,7 @@ def	information_schema	SPATIAL_REF_SYS	AUTH_NAME	2	''	NO	varchar	512	1536	NULL	N
 def	information_schema	SPATIAL_REF_SYS	AUTH_SRID	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(5)					NEVER	NULL
 def	information_schema	SPATIAL_REF_SYS	SRID	1	0	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5)					NEVER	NULL
 def	information_schema	SPATIAL_REF_SYS	SRTEXT	4	''	NO	varchar	2048	6144	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(2048)					NEVER	NULL
+def	information_schema	SQL_FUNCTIONS	FUNCTION	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	STATISTICS	CARDINALITY	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)					NEVER	NULL
 def	information_schema	STATISTICS	COLLATION	9	NULL	YES	varchar	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1)					NEVER	NULL
 def	information_schema	STATISTICS	COLUMN_NAME	8	''	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)					NEVER	NULL
@@ -716,6 +718,7 @@ NULL	information_schema	GEOMETRY_COLUMNS	SRID	smallint	NULL	NULL	NULL	NULL	small
 3.0000	information_schema	INDEX_STATISTICS	TABLE_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 3.0000	information_schema	INDEX_STATISTICS	INDEX_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 NULL	information_schema	INDEX_STATISTICS	ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
+3.0000	information_schema	KEYWORDS	WORD	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_CACHES	KEY_CACHE_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 NULL	information_schema	KEY_CACHES	SEGMENTS	int	NULL	NULL	NULL	NULL	int(3) unsigned
 NULL	information_schema	KEY_CACHES	SEGMENT_NUMBER	int	NULL	NULL	NULL	NULL	int(3) unsigned
@@ -871,6 +874,7 @@ NULL	information_schema	SPATIAL_REF_SYS	SRID	smallint	NULL	NULL	NULL	NULL	smalli
 3.0000	information_schema	SPATIAL_REF_SYS	AUTH_NAME	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 NULL	information_schema	SPATIAL_REF_SYS	AUTH_SRID	int	NULL	NULL	NULL	NULL	int(5)
 3.0000	information_schema	SPATIAL_REF_SYS	SRTEXT	varchar	2048	6144	utf8	utf8_general_ci	varchar(2048)
+3.0000	information_schema	SQL_FUNCTIONS	FUNCTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)

diff --git a/mysql-test/suite/funcs_1/r/is_tables_is.result b/mysql-test/suite/funcs_1/r/is_tables_is.result
@@ -405,6 +405,29 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
+TABLE_NAME	KEYWORDS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	11
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	def
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_CACHES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -704,6 +727,29 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SQL_FUNCTIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	11
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	def
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1364,6 +1410,29 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
+TABLE_NAME	KEYWORDS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	11
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	def
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_CACHES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1663,6 +1732,29 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SQL_FUNCTIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	11
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	def
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY