1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[fixup] Spider fixup after merge

Browse Source 
- Remove some references to dead macros
This commit is contained in:
Yuchen Pei 2023-10-17 15:28:16 +11:00
parent 515f8de243
commit 8f9059422e
No known key found for this signature in database
GPG Key ID: 3DD1B35105743563
4 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/spider/ha_spider.cc
View File

@ -432,9 +432,6 @@ int ha_spider::open(
} else
wide_handler->semi_table_lock =
spider_param_semi_table_lock(thd, share->semi_table_lock);
#ifdef HA_CAN_BULK_ACCESS
external_lock_cnt = 0;
#endif
if (reset())
{

2
storage/spider/spd_copy_tables.cc
View File

@ -139,9 +139,7 @@ static void spider_minus_1(SPIDER_COPY_TABLES *copy_tables)
copy_tables->bulk_insert_rows = -1;
copy_tables->use_table_charset = -1;
copy_tables->use_transaction = -1;
#ifndef WITHOUT_SPIDER_BG_SEARCH
copy_tables->bg_mode = -1;
#endif
}
int spider_udf_parse_copy_tables_param(

24
storage/spider/spd_db_conn.cc
View File

@ -5452,16 +5452,6 @@ int spider_db_bulk_insert(
}
pthread_mutex_lock(&conn->mta_conn_mutex);
SPIDER_SET_FILE_POS(&conn->mta_conn_mutex_file_pos);
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
} else {
sql_type = SPIDER_SQL_TYPE_INSERT_HS;
conn = spider->hs_w_conns[roop_count2];
dbton_handler = spider->dbton_handler[conn->dbton_id];
pthread_mutex_assert_not_owner(&conn->mta_conn_mutex);
pthread_mutex_lock(&conn->mta_conn_mutex);
SPIDER_SET_FILE_POS(&conn->mta_conn_mutex_file_pos);
}
#endif
conn->need_mon = &spider->need_mons[roop_count2];
DBUG_ASSERT(!conn->mta_conn_mutex_lock_already);
DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later);
@ -6175,13 +6165,6 @@ int spider_db_direct_update(
}
pthread_mutex_lock(&conn->mta_conn_mutex);
SPIDER_SET_FILE_POS(&conn->mta_conn_mutex_file_pos);
#ifdef HA_CAN_BULK_ACCESS
if (spider->is_bulk_access_clone)
{
spider->connection_ids[roop_count] = conn->connection_id;
spider_trx_add_bulk_access_conn(spider->wide_handler->trx, conn);
} else {
#endif
conn->need_mon = &spider->need_mons[roop_count];
DBUG_ASSERT(!conn->mta_conn_mutex_lock_already);
DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later);
@ -6440,13 +6423,6 @@ int spider_db_direct_delete(
}
pthread_mutex_lock(&conn->mta_conn_mutex);
SPIDER_SET_FILE_POS(&conn->mta_conn_mutex_file_pos);
#ifdef HA_CAN_BULK_ACCESS
if (spider->is_bulk_access_clone)
{
spider->connection_ids[roop_count] = conn->connection_id;
spider_trx_add_bulk_access_conn(spider->wide_handler->trx, conn);
} else {
#endif
conn->need_mon = &spider->need_mons[roop_count];
DBUG_ASSERT(!conn->mta_conn_mutex_lock_already);
DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later);

8
storage/spider/spd_table.cc
View File

@ -1906,7 +1906,6 @@ static int spider_get_connect_info(const int type,
{
switch (type)
{
#ifdef WITH_PARTITION_STORAGE_ENGINE
case 4:
if (!sub_elem || !sub_elem->part_comment)
return 1;
@ -1921,7 +1920,6 @@ static int spider_get_connect_info(const int type,
part_elem->part_comment, strlen(part_elem->part_comment))))
return HA_ERR_OUT_OF_MEM;
break;
#endif
case 2:
if (table_share->comment.length == 0)
return 1;
@ -2160,11 +2158,7 @@ int spider_parse_connect_info(
option_struct= table_share->option_struct;
spider_minus_1(share, table_share);
#ifdef WITH_PARTITION_STORAGE_ENGINE
for (int i = 4; i > 0; i--)
#else
for (roop_count = 2; roop_count > 0; roop_count--)
#endif
{
if (connect_string)
{
@ -7917,7 +7911,7 @@ bool spider_check_direct_order_limit(
DBUG_PRINT("info",("spider with distinct"));
spider->result_list.direct_distinct = TRUE;
}
spider->result_list.direct_aggregate = spider_param_direct_aggregate(thd);
spider->result_list.direct_aggregate = spider_param_direct_aggregate(thd);
DBUG_PRINT("info",("spider select_limit=%lld", select_limit));
DBUG_PRINT("info",("spider offset_limit=%lld", offset_limit));
if (