database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-28363 remove #ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor

Browse Source
This commit is contained in:
Yuchen Pei
2023-04-13 23:10:52 +10:00
parent d20a96f9c1
commit 54c11273e3
6 changed files with 0 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/spider/ha_spider.cc
View File

@@ -11849,7 +11849,6 @@ int ha_spider::mk_bulk_tmp_table_and_bulk_start()
dbton_hdl->first_link_idx >= 0 && dbton_hdl->first_link_idx >= 0 &&
dbton_hdl->need_copy_for_update(roop_count) 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")}; LEX_CSTRING field_name = {STRING_WITH_LEN("a")};
if ( if (
!tmp_table[roop_count] && !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], &result_list.upd_tmp_tbl_prms[roop_count],
&field_name, result_list.update_sqls[roop_count].charset())) &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; error_num = HA_ERR_OUT_OF_MEM;
goto error_2; goto error_2;

14
storage/spider/spd_db_conn.cc
View File

@@ -3419,18 +3419,12 @@ int spider_db_store_result(
DBUG_PRINT("info",("spider store result to temporary table")); DBUG_PRINT("info",("spider store result to temporary table"));
DBUG_ASSERT(!current->result_tmp_tbl); 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_name1 = {STRING_WITH_LEN("a")};
LEX_CSTRING field_name2 = {STRING_WITH_LEN("b")}; LEX_CSTRING field_name2 = {STRING_WITH_LEN("b")};
LEX_CSTRING field_name3 = {STRING_WITH_LEN("c")}; LEX_CSTRING field_name3 = {STRING_WITH_LEN("c")};
if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result( if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result(
thd, table, &current->result_tmp_tbl_prm, &field_name1, &field_name2, thd, table, &current->result_tmp_tbl_prm, &field_name1, &field_name2,
&field_name3, &my_charset_bin))) &field_name3, &my_charset_bin)))
#else
if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result(
thd, table, &current->result_tmp_tbl_prm, "a", "b", "c",
&my_charset_bin)))
#endif
{ {
DBUG_RETURN(HA_ERR_OUT_OF_MEM); 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_PRINT("info",("spider store result to temporary table"));
DBUG_ASSERT(!current->result_tmp_tbl); 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_name1 = {STRING_WITH_LEN("a")};
LEX_CSTRING field_name2 = {STRING_WITH_LEN("b")}; LEX_CSTRING field_name2 = {STRING_WITH_LEN("b")};
LEX_CSTRING field_name3 = {STRING_WITH_LEN("c")}; LEX_CSTRING field_name3 = {STRING_WITH_LEN("c")};
if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result( if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result(
thd, table, &current->result_tmp_tbl_prm, &field_name1, &field_name2, thd, table, &current->result_tmp_tbl_prm, &field_name1, &field_name2,
&field_name3, &my_charset_bin))) &field_name3, &my_charset_bin)))
#else
if (!(current->result_tmp_tbl = spider_mk_sys_tmp_table_for_result(
thd, table, &current->result_tmp_tbl_prm, "a", "b", "c",
&my_charset_bin)))
#endif
{
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
}
current->result_tmp_tbl_thd = thd; current->result_tmp_tbl_thd = thd;
TABLE *tmp_tbl = current->result_tmp_tbl; TABLE *tmp_tbl = current->result_tmp_tbl;
tmp_tbl->file->extra(HA_EXTRA_WRITE_CACHE); tmp_tbl->file->extra(HA_EXTRA_WRITE_CACHE);

5
storage/spider/spd_db_mysql.cc
View File

@@ -12897,14 +12897,9 @@ int spider_mbase_handler::mk_bulk_tmp_table_and_bulk_start()
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
if (!upd_tmp_tbl) if (!upd_tmp_tbl)
{ {
#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor
LEX_CSTRING field_name = {STRING_WITH_LEN("a")}; LEX_CSTRING field_name = {STRING_WITH_LEN("a")};
if (!(upd_tmp_tbl = spider_mk_sys_tmp_table( if (!(upd_tmp_tbl = spider_mk_sys_tmp_table(
thd, table, &upd_tmp_tbl_prm, &field_name, update_sql.charset()))) 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); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }

1
storage/spider/spd_include.h
View File

@@ -107,7 +107,6 @@
#define SPIDER_read_record_read_record(A) read_record() #define SPIDER_read_record_read_record(A) read_record()
#define SPIDER_has_Item_with_subquery #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_use_LEX_CSTRING_for_database_tablename_alias
#define SPIDER_THD_db_str(A) (A)->db.str #define SPIDER_THD_db_str(A) (A)->db.str
#define SPIDER_THD_db_length(A) (A)->db.length #define SPIDER_THD_db_length(A) (A)->db.length

22
storage/spider/spd_sys_table.cc
View File

@@ -3523,7 +3523,6 @@ error:
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor
TABLE *spider_mk_sys_tmp_table( TABLE *spider_mk_sys_tmp_table(
THD *thd, THD *thd,
TABLE *table, TABLE *table,
@@ -3531,15 +3530,6 @@ TABLE *spider_mk_sys_tmp_table(
const LEX_CSTRING *field_name, const LEX_CSTRING *field_name,
CHARSET_INFO *cs 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; Field_blob *field;
Item_field *i_field; Item_field *i_field;
@@ -3586,7 +3576,6 @@ void spider_rm_sys_tmp_table(
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor
TABLE *spider_mk_sys_tmp_table_for_result( TABLE *spider_mk_sys_tmp_table_for_result(
THD *thd, THD *thd,
TABLE *table, TABLE *table,
@@ -3596,17 +3585,6 @@ TABLE *spider_mk_sys_tmp_table_for_result(
const LEX_CSTRING *field_name3, const LEX_CSTRING *field_name3,
CHARSET_INFO *cs 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; Field_blob *field1, *field2, *field3;
Item_field *i_field1, *i_field2, *i_field3; Item_field *i_field1, *i_field2, *i_field3;

22
storage/spider/spd_sys_table.h
View File

@@ -569,7 +569,6 @@ int spider_sys_replace(
bool *modified_non_trans_table bool *modified_non_trans_table
); );
#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor
TABLE *spider_mk_sys_tmp_table( TABLE *spider_mk_sys_tmp_table(
THD *thd, THD *thd,
TABLE *table, TABLE *table,
@@ -577,15 +576,6 @@ TABLE *spider_mk_sys_tmp_table(
const LEX_CSTRING *field_name, const LEX_CSTRING *field_name,
CHARSET_INFO *cs 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( void spider_rm_sys_tmp_table(
THD *thd, THD *thd,
@@ -593,7 +583,6 @@ void spider_rm_sys_tmp_table(
TMP_TABLE_PARAM *tmp_tbl_prm TMP_TABLE_PARAM *tmp_tbl_prm
); );
#ifdef SPIDER_use_LEX_CSTRING_for_Field_blob_constructor
TABLE *spider_mk_sys_tmp_table_for_result( TABLE *spider_mk_sys_tmp_table_for_result(
THD *thd, THD *thd,
TABLE *table, TABLE *table,
@@ -603,17 +592,6 @@ TABLE *spider_mk_sys_tmp_table_for_result(
const LEX_CSTRING *field_name3, const LEX_CSTRING *field_name3,
CHARSET_INFO *cs 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( void spider_rm_sys_tmp_table_for_result(
THD *thd, THD *thd,