From a8dac17a42c246478bf5ac6c45539779a6aa2ce3 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Thu, 13 Apr 2023 23:10:52 +1000 Subject: MDEV-28363 remove #ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor --- storage/spider/ha_spider.cc | 10 ---------- storage/spider/spd_db_conn.cc | 14 -------------- storage/spider/spd_db_mysql.cc | 5 ----- storage/spider/spd_include.h | 1 - storage/spider/spd_sys_table.cc | 22 ---------------------- storage/spider/spd_sys_table.h | 22 ---------------------- 6 files changed, 74 deletions(-) diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index d17bb83de39..e5ef9499eda 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -11849,7 +11849,6 @@ int ha_spider::mk_bulk_tmp_table_and_bulk_start() dbton_hdl->first_link_idx >= 0 && dbton_hdl->need_copy_for_update(roop_count) ) { -#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor LEX_CSTRING field_name = {STRING_WITH_LEN("a")}; if ( !tmp_table[roop_count] && @@ -11858,15 +11857,6 @@ int ha_spider::mk_bulk_tmp_table_and_bulk_start() &result_list.upd_tmp_tbl_prms[roop_count], &field_name, result_list.update_sqls[roop_count].charset())) ) -#else - if ( - !tmp_table[roop_count] && - !(tmp_table[roop_count] = spider_mk_sys_tmp_table( - wide_handler->trx->thd, table, - &result_list.upd_tmp_tbl_prms[roop_count], "a", - result_list.update_sqls[roop_count].charset())) - ) -#endif { error_num = HA_ERR_OUT_OF_MEM; goto error_2; diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index 9c91d666c0a..80e4a541790 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -3419,18 +3419,12 @@ int spider_db_store_result( DBUG_PRINT("info",("spider store result to temporary table")); DBUG_ASSERT(!current->result_tmp_tbl); -#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor LEX_CSTRING field_name1 = {STRING_WITH_LEN("a")}; LEX_CSTRING field_name2 = {STRING_WITH_LEN("b")}; LEX_CSTRING field_name3 = {STRING_WITH_LEN("c")}; if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result( thd, table, ¤t->result_tmp_tbl_prm, &field_name1, &field_name2, &field_name3, &my_charset_bin))) -#else - if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result( - thd, table, ¤t->result_tmp_tbl_prm, "a", "b", "c", - &my_charset_bin))) -#endif { DBUG_RETURN(HA_ERR_OUT_OF_MEM); } @@ -3780,21 +3774,13 @@ int spider_db_store_result_for_reuse_cursor( DBUG_PRINT("info",("spider store result to temporary table")); DBUG_ASSERT(!current->result_tmp_tbl); -#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor LEX_CSTRING field_name1 = {STRING_WITH_LEN("a")}; LEX_CSTRING field_name2 = {STRING_WITH_LEN("b")}; LEX_CSTRING field_name3 = {STRING_WITH_LEN("c")}; if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result( thd, table, ¤t->result_tmp_tbl_prm, &field_name1, &field_name2, &field_name3, &my_charset_bin))) -#else - if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result( - thd, table, ¤t->result_tmp_tbl_prm, "a", "b", "c", - &my_charset_bin))) -#endif - { DBUG_RETURN(HA_ERR_OUT_OF_MEM); - } current->result_tmp_tbl_thd = thd; TABLE *tmp_tbl = current->result_tmp_tbl; tmp_tbl->file->extra(HA_EXTRA_WRITE_CACHE); diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index 0a31f46b9c9..3f3ee266839 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -12941,14 +12941,9 @@ int spider_mbase_handler::mk_bulk_tmp_table_and_bulk_start() DBUG_PRINT("info",("spider this=%p", this)); if (!upd_tmp_tbl) { -#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor LEX_CSTRING field_name = {STRING_WITH_LEN("a")}; if (!(upd_tmp_tbl = spider_mk_sys_tmp_table( thd, table, &upd_tmp_tbl_prm, &field_name, update_sql.charset()))) -#else - if (!(upd_tmp_tbl = spider_mk_sys_tmp_table( - thd, table, &upd_tmp_tbl_prm, "a", update_sql.charset()))) -#endif { DBUG_RETURN(HA_ERR_OUT_OF_MEM); } diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h index e6d4c2dca87..35f348ca999 100644 --- a/storage/spider/spd_include.h +++ b/storage/spider/spd_include.h @@ -107,7 +107,6 @@ #define SPIDER_read_record_read_record(A) read_record() #define SPIDER_has_Item_with_subquery -#define SPIDER_use_LEX_CSTRING_for_Field_blob_constructor #define SPIDER_use_LEX_CSTRING_for_database_tablename_alias #define SPIDER_THD_db_str(A) (A)->db.str #define SPIDER_THD_db_length(A) (A)->db.length diff --git a/storage/spider/spd_sys_table.cc b/storage/spider/spd_sys_table.cc index fdab66161d5..b42215a2da3 100644 --- a/storage/spider/spd_sys_table.cc +++ b/storage/spider/spd_sys_table.cc @@ -3523,7 +3523,6 @@ error: DBUG_RETURN(error_num); } -#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor TABLE *spider_mk_sys_tmp_table( THD *thd, TABLE *table, @@ -3531,15 +3530,6 @@ TABLE *spider_mk_sys_tmp_table( const LEX_CSTRING *field_name, CHARSET_INFO *cs ) -#else -TABLE *spider_mk_sys_tmp_table( - THD *thd, - TABLE *table, - TMP_TABLE_PARAM *tmp_tbl_prm, - const char *field_name, - CHARSET_INFO *cs -) -#endif { Field_blob *field; Item_field *i_field; @@ -3586,7 +3576,6 @@ void spider_rm_sys_tmp_table( DBUG_VOID_RETURN; } -#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor TABLE *spider_mk_sys_tmp_table_for_result( THD *thd, TABLE *table, @@ -3596,17 +3585,6 @@ TABLE *spider_mk_sys_tmp_table_for_result( const LEX_CSTRING *field_name3, CHARSET_INFO *cs ) -#else -TABLE *spider_mk_sys_tmp_table_for_result( - THD *thd, - TABLE *table, - TMP_TABLE_PARAM *tmp_tbl_prm, - const char *field_name1, - const char *field_name2, - const char *field_name3, - CHARSET_INFO *cs -) -#endif { Field_blob *field1, *field2, *field3; Item_field *i_field1, *i_field2, *i_field3; diff --git a/storage/spider/spd_sys_table.h b/storage/spider/spd_sys_table.h index b26f08204cb..0ad98893322 100644 --- a/storage/spider/spd_sys_table.h +++ b/storage/spider/spd_sys_table.h @@ -569,7 +569,6 @@ int spider_sys_replace( bool *modified_non_trans_table ); -#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor TABLE *spider_mk_sys_tmp_table( THD *thd, TABLE *table, @@ -577,15 +576,6 @@ TABLE *spider_mk_sys_tmp_table( const LEX_CSTRING *field_name, CHARSET_INFO *cs ); -#else -TABLE *spider_mk_sys_tmp_table( - THD *thd, - TABLE *table, - TMP_TABLE_PARAM *tmp_tbl_prm, - const char *field_name, - CHARSET_INFO *cs -); -#endif void spider_rm_sys_tmp_table( THD *thd, @@ -593,7 +583,6 @@ void spider_rm_sys_tmp_table( TMP_TABLE_PARAM *tmp_tbl_prm ); -#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor TABLE *spider_mk_sys_tmp_table_for_result( THD *thd, TABLE *table, @@ -603,17 +592,6 @@ TABLE *spider_mk_sys_tmp_table_for_result( const LEX_CSTRING *field_name3, CHARSET_INFO *cs ); -#else -TABLE *spider_mk_sys_tmp_table_for_result( - THD *thd, - TABLE *table, - TMP_TABLE_PARAM *tmp_tbl_prm, - const char *field_name1, - const char *field_name2, - const char *field_name3, - CHARSET_INFO *cs -); -#endif void spider_rm_sys_tmp_table_for_result( THD *thd, -- cgit v1.2.1