From 03a5c683f930bdd6c044842232b254ba14b8f6b0 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Tue, 8 Oct 2024 11:46:52 +1100 Subject: [PATCH] MDEV-27650 Spider: remove #ifdef SPIDER_HAS_GROUP_BY_HANDLER --- storage/spider/ha_spider.cc | 6 ------ storage/spider/ha_spider.h | 2 -- storage/spider/spd_conn.cc | 8 -------- storage/spider/spd_db_conn.cc | 16 ---------------- storage/spider/spd_db_include.h | 8 -------- storage/spider/spd_db_mysql.cc | 6 ------ storage/spider/spd_db_mysql.h | 6 ------ storage/spider/spd_db_oracle.cc | 6 ------ storage/spider/spd_db_oracle.h | 6 ------ storage/spider/spd_group_by_handler.cc | 2 -- storage/spider/spd_group_by_handler.h | 2 -- storage/spider/spd_include.h | 2 -- storage/spider/spd_table.cc | 6 ------ 13 files changed, 76 deletions(-) diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index b4be3c2fd8e..2acf9a9d3af 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -87,9 +87,7 @@ ha_spider::ha_spider( sql_kinds = 0; error_mode = 0; use_spatial_index = FALSE; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER use_fields = FALSE; -#endif dml_inited = FALSE; use_pre_call = FALSE; use_pre_action = FALSE; @@ -155,9 +153,7 @@ ha_spider::ha_spider( sql_kinds = 0; error_mode = 0; use_spatial_index = FALSE; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER use_fields = FALSE; -#endif dml_inited = FALSE; use_pre_call = FALSE; use_pre_action = FALSE; @@ -1213,9 +1209,7 @@ int ha_spider::reset() result_list.set_split_read = FALSE; result_list.insert_dup_update_pushdown = FALSE; use_spatial_index = FALSE; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER use_fields = FALSE; -#endif error_mode = 0; DBUG_RETURN(error_num); } diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h index 446bbbc4d94..6d2e0e40c57 100644 --- a/storage/spider/ha_spider.h +++ b/storage/spider/ha_spider.h @@ -99,13 +99,11 @@ public: bool da_status; bool use_spatial_index; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER uint idx_for_direct_join; bool use_fields; spider_fields *fields; SPIDER_LINK_IDX_CHAIN *link_idx_chain; SPIDER_LINK_IDX_CHAIN *result_link_idx_chain; -#endif /* for mrr */ bool mrr_with_cnt; diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc index 8cb55e8415f..8b7193ed94a 100644 --- a/storage/spider/spd_conn.cc +++ b/storage/spider/spd_conn.cc @@ -1749,7 +1749,6 @@ int spider_set_conn_bg_param( if (result_list->bgs_phase > 0) { -#ifdef SPIDER_HAS_GROUP_BY_HANDLER if (spider->use_fields) { SPIDER_LINK_IDX_CHAIN *link_idx_chain; @@ -1761,7 +1760,6 @@ int spider_set_conn_bg_param( DBUG_RETURN(error_num); } } else { -#endif for ( roop_count = spider_conn_link_idx_next(share->link_statuses, spider->conn_link_idx, -1, share->link_count, @@ -1776,9 +1774,7 @@ int spider_set_conn_bg_param( if ((error_num = spider_create_conn_thread(spider->conns[roop_count]))) DBUG_RETURN(error_num); } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER } -#endif } DBUG_RETURN(0); } @@ -2234,9 +2230,7 @@ int spider_bg_conn_search( conn->bg_target = spider; conn->link_idx = link_idx; conn->bg_discard_result = discard_result; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER conn->link_idx_chain = spider->link_idx_chain; -#endif pthread_mutex_lock(&conn->bg_conn_sync_mutex); pthread_cond_signal(&conn->bg_conn_cond); pthread_mutex_unlock(&conn->bg_conn_mutex); @@ -2378,9 +2372,7 @@ int spider_bg_conn_search( conn->bg_target = spider; conn->link_idx = link_idx; conn->bg_discard_result = discard_result; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER conn->link_idx_chain = spider->link_idx_chain; -#endif result_list->bgs_working = TRUE; conn->bg_search = TRUE; if (with_lock) diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index 8750e87237e..c4259968b68 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -2928,16 +2928,12 @@ int spider_db_fetch_table( DBUG_RETURN(error_num); } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER if (!spider->use_fields) { -#endif if ((error_num = spider_db_append_match_fetch(spider, spider->ft_first, spider->ft_current, row))) DBUG_RETURN(error_num); -#ifdef SPIDER_HAS_GROUP_BY_HANDLER } -#endif for ( field = table->field; @@ -4521,10 +4517,8 @@ int spider_db_seek_next( (SPIDER_RESULT*) result_list->current); int roop_start = 0, roop_end = 1, roop_count, lock_mode, link_ok = 0; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER if (!spider->use_fields) { -#endif lock_mode = spider_conn_lock_mode(spider); if (lock_mode) { @@ -4541,14 +4535,11 @@ int spider_db_seek_next( roop_start = link_idx; roop_end = link_idx + 1; } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER } -#endif #ifndef WITHOUT_SPIDER_BG_SEARCH if (result_list->bgs_phase > 0) { -#ifdef SPIDER_HAS_GROUP_BY_HANDLER if (spider->use_fields) { SPIDER_LINK_IDX_CHAIN *link_idx_chain; @@ -4572,7 +4563,6 @@ int spider_db_seek_next( } } } else { -#endif for (roop_count = roop_start; roop_count < roop_end; roop_count = spider_conn_link_idx_next(share->link_statuses, spider->conn_link_idx, roop_count, share->link_count, @@ -4585,9 +4575,7 @@ int spider_db_seek_next( DBUG_RETURN(error_num); } } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER } -#endif } else { #endif if (result_list->current == result_list->bgs_current) @@ -4639,7 +4627,6 @@ int spider_db_seek_next( } } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER if (spider->use_fields) { SPIDER_LINK_IDX_CHAIN *link_idx_chain; @@ -4729,7 +4716,6 @@ int spider_db_seek_next( } } } else { -#endif for (roop_count = roop_start; roop_count < roop_end; roop_count = spider_conn_link_idx_next(share->link_statuses, spider->conn_link_idx, roop_count, share->link_count, @@ -4865,9 +4851,7 @@ int spider_db_seek_next( } } } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER } -#endif } else { spider->connection_ids[link_idx] = conn->connection_id; pthread_mutex_assert_not_owner(&conn->mta_conn_mutex); diff --git a/storage/spider/spd_db_include.h b/storage/spider/spd_db_include.h index 015b65b2674..eb7875ac056 100644 --- a/storage/spider/spd_db_include.h +++ b/storage/spider/spd_db_include.h @@ -44,8 +44,6 @@ #define SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY #define SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY_AND_THDPTR -#define SPIDER_HAS_GROUP_BY_HANDLER - #define SPIDER_ORDER_HAS_ENUM_ORDER #define SPIDER_ITEM_GEOFUNC_NAME_HAS_MBR @@ -776,7 +774,6 @@ public: spider_string *to, String *from ) = 0; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER virtual int append_from_and_tables( ha_spider *spider, spider_fields *fields, @@ -790,7 +787,6 @@ public: virtual int append_having( spider_string *str ) = 0; -#endif virtual bool tables_on_different_db_are_joinable(); virtual bool socket_has_default_value(); virtual bool database_has_default_value(); @@ -1411,13 +1407,11 @@ public: virtual int reset_sql( ulong sql_type ) = 0; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER virtual int set_sql_for_exec( ulong sql_type, int link_idx, SPIDER_LINK_IDX_CHAIN *link_idx_chain ) = 0; -#endif virtual int set_sql_for_exec( ulong sql_type, int link_idx @@ -1531,7 +1525,6 @@ public: int link_idx, ulong sql_type ) = 0; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER virtual int append_from_and_tables_part( spider_fields *fields, ulong sql_type @@ -1574,7 +1567,6 @@ public: spider_fields *fields, ulong sql_type ) = 0; -#endif virtual bool check_direct_update( st_select_lex *select_lex, longlong select_limit, diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index 022b789b641..7e10b796f25 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -6216,7 +6216,6 @@ int spider_db_mbase_util::append_escaped_util( DBUG_RETURN(0); } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER /* Walk a TABLE_LIST, or format it to a string and append it. @@ -6500,7 +6499,6 @@ int spider_db_mbase_util::append_having( str->q_append(SPIDER_SQL_HAVING_STR, SPIDER_SQL_HAVING_LEN); DBUG_RETURN(0); } -#endif bool spider_db_mbase_util::append_charset_name_before_string() { @@ -12475,7 +12473,6 @@ int spider_mbase_handler::reset_sql( } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int spider_mbase_handler::set_sql_for_exec( ulong sql_type, int link_idx, @@ -12489,7 +12486,6 @@ int spider_mbase_handler::set_sql_for_exec( } DBUG_RETURN(0); } -#endif int spider_mbase_handler::set_sql_for_exec( ulong sql_type, @@ -13853,7 +13849,6 @@ int spider_mbase_handler::reset_union_table_name( DBUG_RETURN(0); } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int spider_mbase_handler::append_from_and_tables_part( spider_fields *fields, ulong sql_type @@ -14154,7 +14149,6 @@ int spider_mbase_handler::append_order_by( } DBUG_RETURN(0); } -#endif bool spider_mbase_handler::check_direct_update( st_select_lex *select_lex, diff --git a/storage/spider/spd_db_mysql.h b/storage/spider/spd_db_mysql.h index 7eeb5bed7fb..028a69e843b 100644 --- a/storage/spider/spd_db_mysql.h +++ b/storage/spider/spd_db_mysql.h @@ -158,7 +158,6 @@ public: spider_string *to, String *from ) override; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int append_tables_top_down_check( TABLE_LIST *table_list, TABLE_LIST **used_table_list, @@ -188,7 +187,6 @@ public: int append_having( spider_string *str ) override; -#endif bool append_charset_name_before_string() override; }; @@ -1348,13 +1346,11 @@ public: int reset_sql( ulong sql_type ) override; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int set_sql_for_exec( ulong sql_type, int link_idx, SPIDER_LINK_IDX_CHAIN *link_idx_chain ) override; -#endif int set_sql_for_exec( ulong sql_type, int link_idx @@ -1473,7 +1469,6 @@ public: int link_idx, ulong sql_type ) override; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int append_from_and_tables_part( spider_fields *fields, ulong sql_type @@ -1540,7 +1535,6 @@ public: bool use_fields, spider_fields *fields ); -#endif bool check_direct_update( st_select_lex *select_lex, longlong select_limit, diff --git a/storage/spider/spd_db_oracle.cc b/storage/spider/spd_db_oracle.cc index 455b52177dd..19295d40c5f 100644 --- a/storage/spider/spd_db_oracle.cc +++ b/storage/spider/spd_db_oracle.cc @@ -4304,7 +4304,6 @@ int spider_db_oracle_util::append_escaped_util( DBUG_RETURN(0); } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int spider_db_oracle_util::append_from_and_tables( ha_spider *spider, spider_fields *fields, @@ -4422,7 +4421,6 @@ int spider_db_oracle_util::append_having( str->q_append(SPIDER_SQL_HAVING_STR, SPIDER_SQL_HAVING_LEN); DBUG_RETURN(0); } -#endif spider_oracle_share::spider_oracle_share( st_spider_share *share @@ -10426,7 +10424,6 @@ bool spider_oracle_handler::need_lock_before_set_sql_for_exec( DBUG_RETURN(FALSE); } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int spider_oracle_handler::set_sql_for_exec( ulong sql_type, int link_idx, @@ -10471,7 +10468,6 @@ int spider_oracle_handler::set_sql_for_exec( } DBUG_RETURN(0); } -#endif int spider_oracle_handler::set_sql_for_exec( ulong sql_type, @@ -12304,7 +12300,6 @@ int spider_oracle_handler::reset_union_table_name( DBUG_RETURN(0); } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int spider_oracle_handler::append_from_and_tables_part( spider_fields *fields, ulong sql_type @@ -12633,7 +12628,6 @@ int spider_oracle_handler::append_order_by( } DBUG_RETURN(0); } -#endif spider_oracle_copy_table::spider_oracle_copy_table( spider_oracle_share *db_share diff --git a/storage/spider/spd_db_oracle.h b/storage/spider/spd_db_oracle.h index d47bc9f7ea6..5f7f4e8ff1f 100644 --- a/storage/spider/spd_db_oracle.h +++ b/storage/spider/spd_db_oracle.h @@ -144,7 +144,6 @@ public: spider_string *to, String *from ); -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int append_from_and_tables( ha_spider *spider, spider_fields *fields, @@ -163,7 +162,6 @@ public: int append_having( spider_string *str ); -#endif }; class spider_db_oracle_row: public spider_db_row @@ -1264,13 +1262,11 @@ public: bool need_lock_before_set_sql_for_exec( ulong sql_type ); -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int set_sql_for_exec( ulong sql_type, int link_idx, SPIDER_LINK_IDX_CHAIN *link_idx_chain ); -#endif int set_sql_for_exec( ulong sql_type, int link_idx @@ -1385,7 +1381,6 @@ public: int link_idx, ulong sql_type ); -#ifdef SPIDER_HAS_GROUP_BY_HANDLER int append_from_and_tables_part( spider_fields *fields, ulong sql_type @@ -1456,7 +1451,6 @@ public: bool use_fields, spider_fields *fields ); -#endif }; class spider_oracle_copy_table: public spider_db_copy_table diff --git a/storage/spider/spd_group_by_handler.cc b/storage/spider/spd_group_by_handler.cc index 481291ec6f0..2e4eb003371 100644 --- a/storage/spider/spd_group_by_handler.cc +++ b/storage/spider/spd_group_by_handler.cc @@ -975,7 +975,6 @@ int spider_fields::ping_table_mon_from_table( DBUG_RETURN(error_num); } -#ifdef SPIDER_HAS_GROUP_BY_HANDLER spider_group_by_handler::spider_group_by_handler( THD *thd_arg, Query *query_arg, @@ -1842,4 +1841,3 @@ skip_free_table_holder: spider_free(spider_current_trx, table_holder, MYF(0)); DBUG_RETURN(NULL); } -#endif diff --git a/storage/spider/spd_group_by_handler.h b/storage/spider/spd_group_by_handler.h index b3984951ec5..db100de92f2 100644 --- a/storage/spider/spd_group_by_handler.h +++ b/storage/spider/spd_group_by_handler.h @@ -13,7 +13,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef SPIDER_HAS_GROUP_BY_HANDLER class spider_group_by_handler: public group_by_handler { Query query; @@ -41,4 +40,3 @@ group_by_handler *spider_create_group_by_handler( THD *thd, Query *query ); -#endif diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h index 7371c6da6f3..1643d1b350e 100644 --- a/storage/spider/spd_include.h +++ b/storage/spider/spd_include.h @@ -755,10 +755,8 @@ typedef struct st_spider_conn query_id_t connect_error_query_id; time_t connect_error_time; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER SPIDER_CONN_HOLDER *conn_holder_for_direct_join; SPIDER_LINK_IDX_CHAIN *link_idx_chain; -#endif SPIDER_IP_PORT_CONN *ip_port_conn; pthread_mutex_t loop_check_mutex; diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index 36bac44f150..5711de586d8 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -6233,9 +6233,7 @@ int spider_db_init( spider_hton->create = spider_create_handler; spider_hton->drop_database = spider_drop_database; spider_hton->show_status = spider_show_status; -#ifdef SPIDER_HAS_GROUP_BY_HANDLER spider_hton->create_group_by = spider_create_group_by_handler; -#endif if (my_gethwaddr((uchar *) addr)) { @@ -7481,13 +7479,11 @@ longlong spider_split_read_param( DBUG_PRINT("info",("spider bulk_update_mode=%d", bulk_update_mode)); DBUG_PRINT("info",("spider support_bulk_update_sql=%s", spider->support_bulk_update_sql() ? "TRUE" : "FALSE")); -#ifdef SPIDER_HAS_GROUP_BY_HANDLER bool inserting = ( spider->wide_handler->sql_command == SQLCOM_INSERT || spider->wide_handler->sql_command == SQLCOM_INSERT_SELECT ); -#endif bool updating = ( spider->wide_handler->sql_command == SQLCOM_UPDATE || @@ -7508,12 +7504,10 @@ longlong spider_split_read_param( DBUG_PRINT("info",("spider replacing=%s", replacing ? "TRUE" : "FALSE")); TABLE *table = spider->get_table(); if ( -#ifdef SPIDER_HAS_GROUP_BY_HANDLER ( inserting && spider->use_fields ) || -#endif replacing || ( (