mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-28522 Delete constant SPIDER_SQL_TYPE_*_HS

Browse source 
The HandlerSocket support of Spider has been deleted by MDEV-26858.
Thus, the constants, SPIDER_SQL_TYPE_*_HS, are no longer necessary.
This commit is contained in:
Nayuta Yanagisawa 2022-05-27 08:55:42 +09:00 committed by Yuchen Pei
parent bdcb2ae509
commit 22392b36ee
No known key found for this signature in database
GPG key ID: 3DD1B35105743563
3 changed files with 44 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
storage/spider/spd_db_include.h
View file

@ -176,11 +176,6 @@ typedef st_spider_result SPIDER_RESULT;
#define SPIDER_SQL_TYPE_TMP_SQL (1 << 5) #define SPIDER_SQL_TYPE_TMP_SQL (1 << 5)
#define SPIDER_SQL_TYPE_DROP_TMP_TABLE_SQL (1 << 6) #define SPIDER_SQL_TYPE_DROP_TMP_TABLE_SQL (1 << 6)
#define SPIDER_SQL_TYPE_OTHER_SQL (1 << 7) #define SPIDER_SQL_TYPE_OTHER_SQL (1 << 7)
#define SPIDER_SQL_TYPE_SELECT_HS (1 << 9)
#define SPIDER_SQL_TYPE_INSERT_HS (1 << 10)
#define SPIDER_SQL_TYPE_UPDATE_HS (1 << 11)
#define SPIDER_SQL_TYPE_DELETE_HS (1 << 12)
#define SPIDER_SQL_TYPE_OTHER_HS (1 << 13)
enum spider_bulk_upd_start { enum spider_bulk_upd_start {
SPD_BU_NOT_START, SPD_BU_NOT_START,

138
storage/spider/spd_db_mysql.cc
View file

@ -12274,23 +12274,14 @@ int spider_mbase_handler::append_from(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
int spider_mbase_handler::append_flush_tables_part( int spider_mbase_handler::append_flush_tables_part(int link_idx, bool lock)
ulong sql_type, {
int link_idx,
bool lock
) {
int error_num; int error_num;
spider_string *str; spider_string *str;
DBUG_ENTER("spider_mbase_handler::append_flush_tables_part"); DBUG_ENTER("spider_mbase_handler::append_flush_tables_part");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
switch (sql_type)
{ str= &spider->result_list.sqls[link_idx];
case SPIDER_SQL_TYPE_OTHER_SQL:
str = &spider->result_list.sqls[link_idx];
break;
default:
DBUG_RETURN(0);
}
error_num = append_flush_tables(str, link_idx, lock); error_num = append_flush_tables(str, link_idx, lock);
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -12318,22 +12309,14 @@ int spider_mbase_handler::append_flush_tables(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
int spider_mbase_handler::append_optimize_table_part( int spider_mbase_handler::append_optimize_table_part(int link_idx)
ulong sql_type, {
int link_idx
) {
int error_num; int error_num;
spider_string *str; spider_string *str;
DBUG_ENTER("spider_mbase_handler::append_optimize_table_part"); DBUG_ENTER("spider_mbase_handler::append_optimize_table_part");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
switch (sql_type)
{ str= &spider->result_list.sqls[link_idx];
case SPIDER_SQL_TYPE_OTHER_SQL:
str = &spider->result_list.sqls[link_idx];
break;
default:
DBUG_RETURN(0);
}
error_num = append_optimize_table(str, link_idx); error_num = append_optimize_table(str, link_idx);
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -12364,22 +12347,14 @@ int spider_mbase_handler::append_optimize_table(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
int spider_mbase_handler::append_analyze_table_part( int spider_mbase_handler::append_analyze_table_part(int link_idx)
ulong sql_type, {
int link_idx
) {
int error_num; int error_num;
spider_string *str; spider_string *str;
DBUG_ENTER("spider_mbase_handler::append_analyze_table_part"); DBUG_ENTER("spider_mbase_handler::append_analyze_table_part");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
switch (sql_type)
{ str= &spider->result_list.sqls[link_idx];
case SPIDER_SQL_TYPE_OTHER_SQL:
str = &spider->result_list.sqls[link_idx];
break;
default:
DBUG_RETURN(0);
}
error_num = append_analyze_table(str, link_idx); error_num = append_analyze_table(str, link_idx);
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -12410,23 +12385,15 @@ int spider_mbase_handler::append_analyze_table(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
int spider_mbase_handler::append_repair_table_part( int spider_mbase_handler::append_repair_table_part(int link_idx,
ulong sql_type, HA_CHECK_OPT *check_opt)
int link_idx, {
HA_CHECK_OPT* check_opt
) {
int error_num; int error_num;
spider_string *str; spider_string *str;
DBUG_ENTER("spider_mbase_handler::append_repair_table_part"); DBUG_ENTER("spider_mbase_handler::append_repair_table_part");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
switch (sql_type)
{ str= &spider->result_list.sqls[link_idx];
case SPIDER_SQL_TYPE_OTHER_SQL:
str = &spider->result_list.sqls[link_idx];
break;
default:
DBUG_RETURN(0);
}
error_num = append_repair_table(str, link_idx, check_opt); error_num = append_repair_table(str, link_idx, check_opt);
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -12476,23 +12443,15 @@ int spider_mbase_handler::append_repair_table(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
int spider_mbase_handler::append_check_table_part( int spider_mbase_handler::append_check_table_part(int link_idx,
ulong sql_type, HA_CHECK_OPT *check_opt)
int link_idx, {
HA_CHECK_OPT* check_opt
) {
int error_num; int error_num;
spider_string *str; spider_string *str;
DBUG_ENTER("spider_mbase_handler::append_check_table_part"); DBUG_ENTER("spider_mbase_handler::append_check_table_part");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
switch (sql_type)
{ str= &spider->result_list.sqls[link_idx];
case SPIDER_SQL_TYPE_OTHER_SQL:
str = &spider->result_list.sqls[link_idx];
break;
default:
DBUG_RETURN(0);
}
error_num = append_check_table(str, link_idx, check_opt); error_num = append_check_table(str, link_idx, check_opt);
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -12541,22 +12500,14 @@ int spider_mbase_handler::append_check_table(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
int spider_mbase_handler::append_enable_keys_part( int spider_mbase_handler::append_enable_keys_part(int link_idx)
ulong sql_type, {
int link_idx
) {
int error_num; int error_num;
spider_string *str; spider_string *str;
DBUG_ENTER("spider_mbase_handler::append_enable_keys_part"); DBUG_ENTER("spider_mbase_handler::append_enable_keys_part");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
switch (sql_type)
{ str= &spider->result_list.sqls[link_idx];
case SPIDER_SQL_TYPE_OTHER_SQL:
str = &spider->result_list.sqls[link_idx];
break;
default:
DBUG_RETURN(0);
}
error_num = append_enable_keys(str, link_idx); error_num = append_enable_keys(str, link_idx);
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -12582,22 +12533,14 @@ int spider_mbase_handler::append_enable_keys(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
int spider_mbase_handler::append_disable_keys_part( int spider_mbase_handler::append_disable_keys_part(int link_idx)
ulong sql_type, {
int link_idx
) {
int error_num; int error_num;
spider_string *str; spider_string *str;
DBUG_ENTER("spider_mbase_handler::append_disable_keys_part"); DBUG_ENTER("spider_mbase_handler::append_disable_keys_part");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
switch (sql_type)
{ str= &spider->result_list.sqls[link_idx];
case SPIDER_SQL_TYPE_OTHER_SQL:
str = &spider->result_list.sqls[link_idx];
break;
default:
DBUG_RETURN(0);
}
error_num = append_disable_keys(str, link_idx); error_num = append_disable_keys(str, link_idx);
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -14620,8 +14563,7 @@ int spider_mbase_handler::disable_keys(
DBUG_ENTER("spider_mbase_handler::disable_keys"); DBUG_ENTER("spider_mbase_handler::disable_keys");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
str->length(0); str->length(0);
if ((error_num = append_disable_keys_part(SPIDER_SQL_TYPE_OTHER_HS, if ((error_num= append_disable_keys_part(link_idx)))
link_idx)))
{ {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -14679,8 +14621,7 @@ int spider_mbase_handler::enable_keys(
DBUG_ENTER("spider_mbase_handler::enable_keys"); DBUG_ENTER("spider_mbase_handler::enable_keys");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
str->length(0); str->length(0);
if ((error_num = append_enable_keys_part(SPIDER_SQL_TYPE_OTHER_HS, if ((error_num= append_enable_keys_part(link_idx)))
link_idx)))
{ {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -14739,8 +14680,7 @@ int spider_mbase_handler::check_table(
DBUG_ENTER("spider_mbase_handler::check_table"); DBUG_ENTER("spider_mbase_handler::check_table");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
str->length(0); str->length(0);
if ((error_num = append_check_table_part(SPIDER_SQL_TYPE_OTHER_HS, if ((error_num= append_check_table_part(link_idx, check_opt)))
link_idx, check_opt)))
{ {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -14799,8 +14739,7 @@ int spider_mbase_handler::repair_table(
DBUG_ENTER("spider_mbase_handler::repair_table"); DBUG_ENTER("spider_mbase_handler::repair_table");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
str->length(0); str->length(0);
if ((error_num = append_repair_table_part(SPIDER_SQL_TYPE_OTHER_HS, if ((error_num= append_repair_table_part(link_idx, check_opt)))
link_idx, check_opt)))
{ {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -14858,8 +14797,7 @@ int spider_mbase_handler::analyze_table(
DBUG_ENTER("spider_mbase_handler::analyze_table"); DBUG_ENTER("spider_mbase_handler::analyze_table");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
str->length(0); str->length(0);
if ((error_num = append_analyze_table_part(SPIDER_SQL_TYPE_OTHER_HS, if ((error_num= append_analyze_table_part(link_idx)))
link_idx)))
{ {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -14917,8 +14855,7 @@ int spider_mbase_handler::optimize_table(
DBUG_ENTER("spider_mbase_handler::optimize_table"); DBUG_ENTER("spider_mbase_handler::optimize_table");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
str->length(0); str->length(0);
if ((error_num = append_optimize_table_part(SPIDER_SQL_TYPE_OTHER_HS, if ((error_num= append_optimize_table_part(link_idx)))
link_idx)))
{ {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
@ -14977,8 +14914,7 @@ int spider_mbase_handler::flush_tables(
DBUG_ENTER("spider_mbase_handler::flush_tables"); DBUG_ENTER("spider_mbase_handler::flush_tables");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
str->length(0); str->length(0);
if ((error_num = append_flush_tables_part(SPIDER_SQL_TYPE_OTHER_HS, if ((error_num= append_flush_tables_part(link_idx, lock)))
link_idx, lock)))
{ {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }

38
storage/spider/spd_db_mysql.h
View file

@ -1214,64 +1214,40 @@ public:
ulong sql_type, ulong sql_type,
int link_idx int link_idx
); );
int append_flush_tables_part( int append_flush_tables_part(int link_idx, bool lock);
ulong sql_type,
int link_idx,
bool lock
);
int append_flush_tables( int append_flush_tables(
spider_string *str, spider_string *str,
int link_idx, int link_idx,
bool lock bool lock
); );
int append_optimize_table_part( int append_optimize_table_part(int link_idx);
ulong sql_type,
int link_idx
);
int append_optimize_table( int append_optimize_table(
spider_string *str, spider_string *str,
int link_idx int link_idx
); );
int append_analyze_table_part( int append_analyze_table_part(int link_idx);
ulong sql_type,
int link_idx
);
int append_analyze_table( int append_analyze_table(
spider_string *str, spider_string *str,
int link_idx int link_idx
); );
int append_repair_table_part( int append_repair_table_part(int link_idx, HA_CHECK_OPT *check_opt);
ulong sql_type,
int link_idx,
HA_CHECK_OPT* check_opt
);
int append_repair_table( int append_repair_table(
spider_string *str, spider_string *str,
int link_idx, int link_idx,
HA_CHECK_OPT* check_opt HA_CHECK_OPT* check_opt
); );
int append_check_table_part( int append_check_table_part(int link_idx, HA_CHECK_OPT *check_opt);
ulong sql_type,
int link_idx,
HA_CHECK_OPT* check_opt
);
int append_check_table( int append_check_table(
spider_string *str, spider_string *str,
int link_idx, int link_idx,
HA_CHECK_OPT* check_opt HA_CHECK_OPT* check_opt
); );
int append_enable_keys_part( int append_enable_keys_part(int link_idx);
ulong sql_type,
int link_idx
);
int append_enable_keys( int append_enable_keys(
spider_string *str, spider_string *str,
int link_idx int link_idx
); );
int append_disable_keys_part( int append_disable_keys_part(int link_idx);
ulong sql_type,
int link_idx
);
int append_disable_keys( int append_disable_keys(
spider_string *str, spider_string *str,
int link_idx int link_idx