Commit 75f5906d authored by Yuchen Pei's avatar Yuchen Pei

MDEV-26247 Remove some unused spider methods

Two methods from spider_fields. There are probably more of these
conn_holder related methods that can be removed

reappend_tables_part()
reappend_tables()
parent 69c1706a
...@@ -638,8 +638,6 @@ class spider_fields ...@@ -638,8 +638,6 @@ class spider_fields
long access_balance long access_balance
); );
SPIDER_CONN_HOLDER *create_conn_holder(); SPIDER_CONN_HOLDER *create_conn_holder();
void set_pos_to_first_conn_holder();
SPIDER_CONN_HOLDER *get_next_conn_holder();
bool has_conn_holder(); bool has_conn_holder();
void clear_conn_holder_from_conn(); void clear_conn_holder_from_conn();
bool check_conn_same_conn( bool check_conn_same_conn(
...@@ -810,11 +808,6 @@ class spider_db_util ...@@ -810,11 +808,6 @@ class spider_db_util
TABLE_LIST *table_list, TABLE_LIST *table_list,
uint table_count uint table_count
) = 0; ) = 0;
virtual int reappend_tables(
spider_fields *fields,
SPIDER_LINK_IDX_CHAIN *link_idx_chain,
spider_string *str
) = 0;
virtual int append_where( virtual int append_where(
spider_string *str spider_string *str
) = 0; ) = 0;
...@@ -1543,10 +1536,6 @@ class spider_db_handler ...@@ -1543,10 +1536,6 @@ class spider_db_handler
spider_fields *fields, spider_fields *fields,
ulong sql_type ulong sql_type
) = 0; ) = 0;
virtual int reappend_tables_part(
spider_fields *fields,
ulong sql_type
) = 0;
virtual int append_where_part( virtual int append_where_part(
ulong sql_type ulong sql_type
) = 0; ) = 0;
......
...@@ -7311,45 +7311,6 @@ int spider_db_mbase_util::append_from_and_tables( ...@@ -7311,45 +7311,6 @@ int spider_db_mbase_util::append_from_and_tables(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
int spider_db_mbase_util::reappend_tables(
spider_fields *fields,
SPIDER_LINK_IDX_CHAIN *link_idx_chain,
spider_string *str
) {
int error_num;
uint32 length;
ha_spider *spider;
spider_mbase_share *db_share;
spider_mbase_handler *dbton_hdl;
SPIDER_TABLE_HOLDER *table_holder;
SPIDER_LINK_IDX_HOLDER *link_idx_holder;
DBUG_ENTER("spider_db_mbase_util::reappend_tables");
DBUG_PRINT("info",("spider this=%p", this));
length = str->length();
fields->set_pos_to_first_table_on_link_idx_chain(link_idx_chain);
fields->set_pos_to_first_table_holder();
while ((table_holder = fields->get_next_table_holder()))
{
link_idx_holder =
fields->get_next_table_on_link_idx_chain(link_idx_chain);
spider = table_holder->spider;
db_share = (spider_mbase_share *)
spider->share->dbton_share[dbton_id];
if (!db_share->same_db_table_name)
{
dbton_hdl = (spider_mbase_handler *) spider->dbton_handler[dbton_id];
str->length(dbton_hdl->table_name_pos);
if ((error_num = db_share->append_table_name_with_adjusting(str,
spider->conn_link_idx[link_idx_holder->link_idx])))
{
DBUG_RETURN(error_num);
}
}
}
str->length(length);
DBUG_RETURN(0);
}
int spider_db_mbase_util::append_where( int spider_db_mbase_util::append_where(
spider_string *str spider_string *str
) { ) {
...@@ -13213,14 +13174,10 @@ int spider_mbase_handler::set_sql_for_exec( ...@@ -13213,14 +13174,10 @@ int spider_mbase_handler::set_sql_for_exec(
int link_idx, int link_idx,
SPIDER_LINK_IDX_CHAIN *link_idx_chain SPIDER_LINK_IDX_CHAIN *link_idx_chain
) { ) {
int error_num;
DBUG_ENTER("spider_mbase_handler::set_sql_for_exec"); DBUG_ENTER("spider_mbase_handler::set_sql_for_exec");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
if (sql_type & SPIDER_SQL_TYPE_SELECT_SQL) if (sql_type & SPIDER_SQL_TYPE_SELECT_SQL)
{ {
if ((error_num = spider_db_mbase_utility->reappend_tables(
spider->fields, link_idx_chain, &sql)))
DBUG_RETURN(error_num);
exec_sql = &sql; exec_sql = &sql;
} }
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -14977,27 +14934,6 @@ int spider_mbase_handler::append_from_and_tables_part( ...@@ -14977,27 +14934,6 @@ int spider_mbase_handler::append_from_and_tables_part(
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
int spider_mbase_handler::reappend_tables_part(
spider_fields *fields,
ulong sql_type
) {
int error_num;
spider_string *str;
DBUG_ENTER("spider_mbase_handler::reappend_tables_part");
DBUG_PRINT("info",("spider this=%p", this));
switch (sql_type)
{
case SPIDER_SQL_TYPE_SELECT_SQL:
str = &sql;
break;
default:
DBUG_RETURN(0);
}
error_num = spider_db_mbase_utility->reappend_tables(fields,
link_idx_chain, str);
DBUG_RETURN(error_num);
}
int spider_mbase_handler::append_where_part( int spider_mbase_handler::append_where_part(
ulong sql_type ulong sql_type
) { ) {
......
...@@ -199,11 +199,6 @@ class spider_db_mbase_util: public spider_db_util ...@@ -199,11 +199,6 @@ class spider_db_mbase_util: public spider_db_util
TABLE_LIST *table_list, TABLE_LIST *table_list,
uint table_count uint table_count
) override; ) override;
int reappend_tables(
spider_fields *fields,
SPIDER_LINK_IDX_CHAIN *link_idx_chain,
spider_string *str
) override;
int append_where( int append_where(
spider_string *str spider_string *str
) override; ) override;
...@@ -1489,10 +1484,6 @@ class spider_mbase_handler: public spider_db_handler ...@@ -1489,10 +1484,6 @@ class spider_mbase_handler: public spider_db_handler
spider_fields *fields, spider_fields *fields,
ulong sql_type ulong sql_type
); );
int reappend_tables_part(
spider_fields *fields,
ulong sql_type
);
int append_where_part( int append_where_part(
ulong sql_type ulong sql_type
); );
......
...@@ -646,24 +646,6 @@ SPIDER_CONN_HOLDER *spider_fields::create_conn_holder( ...@@ -646,24 +646,6 @@ SPIDER_CONN_HOLDER *spider_fields::create_conn_holder(
DBUG_RETURN(return_conn_holder); DBUG_RETURN(return_conn_holder);
} }
void spider_fields::set_pos_to_first_conn_holder(
) {
DBUG_ENTER("spider_fields::set_pos_to_first_conn_holder");
DBUG_PRINT("info",("spider this=%p", this));
current_conn_holder = first_conn_holder;
DBUG_VOID_RETURN;
}
SPIDER_CONN_HOLDER *spider_fields::get_next_conn_holder(
) {
SPIDER_CONN_HOLDER *return_conn_holder = current_conn_holder;
DBUG_ENTER("spider_fields::get_next_conn_holder");
DBUG_PRINT("info",("spider this=%p", this));
if (current_conn_holder)
current_conn_holder = current_conn_holder->next;
DBUG_RETURN(return_conn_holder);
}
bool spider_fields::has_conn_holder( bool spider_fields::has_conn_holder(
) { ) {
DBUG_ENTER("spider_fields::has_conn_holder"); DBUG_ENTER("spider_fields::has_conn_holder");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment