database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-19991 Turn I_S tables GEOMETRY_COLUMNS and SPATIAL_REF_SYS into a plugin

Browse Source 
Cleanups.
This commit is contained in:
Sergey Vojtovich
2019-07-09 13:02:26 +04:00
parent a179de0402
commit 0940e25d69
3 changed files with 7 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
plugin/type_geom/plugin.cc
View File

@ -74,18 +74,11 @@ exit:
} }
static int fill_table_spatial_ref_sys(THD *thd, TABLE_LIST* tables, COND* cond)
{
spatial_ref_sys_fill(thd, tables, cond);
return 0;
}
static int plugin_init_spatial_ref_sys(void *p) static int plugin_init_spatial_ref_sys(void *p)
{ {
ST_SCHEMA_TABLE *schema= (ST_SCHEMA_TABLE *)p; ST_SCHEMA_TABLE *schema= (ST_SCHEMA_TABLE *)p;
schema->fields_info= spatial_ref_sys_fields_info; schema->fields_info= spatial_ref_sys_fields_info;
schema->fill_table= fill_table_spatial_ref_sys; schema->fill_table= spatial_ref_sys_fill;
return 0; return 0;
} }
@ -203,35 +196,15 @@ static int get_geometry_column_record(THD *thd, TABLE_LIST *tables,
} }
static ST_SCHEMA_TABLE geometry_columns=
{
"GEOMETRY_COLUMNS", // table_name
geometry_columns_fields_info, // fields_info
0, // reset_table
NULL, // fill_table
NULL, // old_format
get_geometry_column_record, // process_table
1, // idx_field1
2, // idx_field2
0, // hidden
OPTIMIZE_I_S_TABLE|OPEN_VIEW_FULL // i_s_requested_object
};
static int fill_table_geometry_columns(THD *thd, TABLE_LIST* tables, COND* cond)
{
tables->schema_table= &geometry_columns;
optimize_for_get_all_tables(thd, tables, cond);
get_all_tables(thd, tables, cond);
return 0;
}
static int plugin_init_geometry_columns(void *p) static int plugin_init_geometry_columns(void *p)
{ {
ST_SCHEMA_TABLE *schema= (ST_SCHEMA_TABLE *)p; ST_SCHEMA_TABLE *schema= (ST_SCHEMA_TABLE *)p;
schema->fields_info= geometry_columns_fields_info; schema->fields_info= geometry_columns_fields_info;
schema->fill_table= fill_table_geometry_columns; schema->fill_table= get_all_tables;
schema->process_table= get_geometry_column_record;
schema->idx_field1= 1;
schema->idx_field2= 2;
schema->i_s_requested_object= OPTIMIZE_I_S_TABLE | OPEN_VIEW_FULL;
return 0; return 0;
} }

2
sql/sql_show.cc
View File

@ -8417,7 +8417,7 @@ int make_schema_select(THD *thd, SELECT_LEX *sel,
*/ */
bool optimize_for_get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) static bool optimize_for_get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
{ {
SELECT_LEX *lsel= tables->schema_select_lex; SELECT_LEX *lsel= tables->schema_select_lex;
ST_SCHEMA_TABLE *schema_table= tables->schema_table; ST_SCHEMA_TABLE *schema_table= tables->schema_table;

1
sql/sql_show.h
View File

@ -78,7 +78,6 @@ typedef struct system_status_var STATUS_VAR;
typedef enum { WITHOUT_DB_NAME, WITH_DB_NAME } enum_with_db_name; typedef enum { WITHOUT_DB_NAME, WITH_DB_NAME } enum_with_db_name;
int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond); int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond);
bool optimize_for_get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond);
int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet, int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet,
Table_specification_st *create_info_arg, Table_specification_st *create_info_arg,