Commit 978eb616 authored by Nayuta Yanagisawa's avatar Nayuta Yanagisawa

MDEV-27256 Delete spider_use_handler and related code (3/3)

Fix indentation and format code (mostly done by clang-format-diff).
parent 57d233e2
This diff is collapsed.
...@@ -2516,9 +2516,7 @@ void *spider_bg_conn_action( ...@@ -2516,9 +2516,7 @@ void *spider_bg_conn_action(
!result_list->bgs_current->result !result_list->bgs_current->result
) { ) {
ulong sql_type; ulong sql_type;
{ sql_type= SPIDER_SQL_TYPE_SELECT_SQL | SPIDER_SQL_TYPE_TMP_SQL;
sql_type = SPIDER_SQL_TYPE_SELECT_SQL | SPIDER_SQL_TYPE_TMP_SQL;
}
pthread_mutex_assert_not_owner(&conn->mta_conn_mutex); pthread_mutex_assert_not_owner(&conn->mta_conn_mutex);
if (dbton_handler->need_lock_before_set_sql_for_exec(sql_type)) if (dbton_handler->need_lock_before_set_sql_for_exec(sql_type))
{ {
......
This diff is collapsed.
...@@ -9757,9 +9757,8 @@ int spider_mbase_handler::append_direct_update_set( ...@@ -9757,9 +9757,8 @@ int spider_mbase_handler::append_direct_update_set(
spider_string *str spider_string *str
) { ) {
DBUG_ENTER("spider_mbase_handler::append_direct_update_set"); DBUG_ENTER("spider_mbase_handler::append_direct_update_set");
if ( if (spider->wide_handler->direct_update_fields)
spider->wide_handler->direct_update_fields {
) {
if (str->reserve(SPIDER_SQL_SET_LEN)) if (str->reserve(SPIDER_SQL_SET_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_SET_STR, SPIDER_SQL_SET_LEN); str->q_append(SPIDER_SQL_SET_STR, SPIDER_SQL_SET_LEN);
...@@ -10882,12 +10881,11 @@ int spider_mbase_handler::append_where_terminator( ...@@ -10882,12 +10881,11 @@ int spider_mbase_handler::append_where_terminator(
) { ) {
SPIDER_RESULT_LIST *result_list = &spider->result_list; SPIDER_RESULT_LIST *result_list = &spider->result_list;
DBUG_ENTER("spider_mbase_handler::append_where_terminator"); DBUG_ENTER("spider_mbase_handler::append_where_terminator");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info", ("spider this=%p", this));
{
str->length(str->length() - SPIDER_SQL_AND_LEN); str->length(str->length() - SPIDER_SQL_AND_LEN);
if (!set_order) if (!set_order)
result_list->key_order = key_count; result_list->key_order= key_count;
}
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -12447,19 +12445,18 @@ int spider_mbase_handler::append_from( ...@@ -12447,19 +12445,18 @@ int spider_mbase_handler::append_from(
DBUG_ENTER("spider_mbase_handler::append_from"); DBUG_ENTER("spider_mbase_handler::append_from");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
DBUG_PRINT("info",("spider link_idx=%d", link_idx)); DBUG_PRINT("info",("spider link_idx=%d", link_idx));
int error_num = 0; int error_num= 0;
if (str->reserve(SPIDER_SQL_FROM_LEN + mysql_share->db_nm_max_length +
SPIDER_SQL_DOT_LEN + mysql_share->table_nm_max_length +
/* SPIDER_SQL_NAME_QUOTE_LEN */ 4 +
SPIDER_SQL_OPEN_PAREN_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_FROM_STR, SPIDER_SQL_FROM_LEN);
table_name_pos= str->length();
append_table_name_with_adjusting(str, link_idx, sql_type);
if (spider_param_index_hint_pushdown(spider->wide_handler->trx->thd))
{ {
if (str->reserve(SPIDER_SQL_FROM_LEN + mysql_share->db_nm_max_length + DBUG_RETURN(error_num);
SPIDER_SQL_DOT_LEN + mysql_share->table_nm_max_length +
/* SPIDER_SQL_NAME_QUOTE_LEN */ 4 + SPIDER_SQL_OPEN_PAREN_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_FROM_STR, SPIDER_SQL_FROM_LEN);
table_name_pos = str->length();
append_table_name_with_adjusting(str, link_idx, sql_type);
if(spider_param_index_hint_pushdown(spider->wide_handler->trx->thd))
{
DBUG_RETURN(error_num);
}
} }
DBUG_RETURN(0); DBUG_RETURN(0);
} }
......
...@@ -3585,7 +3585,7 @@ int spider_check_trx_and_get_conn( ...@@ -3585,7 +3585,7 @@ int spider_check_trx_and_get_conn(
*spider->conn_keys[0] = first_byte; *spider->conn_keys[0] = first_byte;
for (roop_count = 0; roop_count < (int) share->link_count; roop_count++) for (roop_count = 0; roop_count < (int) share->link_count; roop_count++)
{ {
spider->conns[roop_count] = NULL; spider->conns[roop_count]= NULL;
} }
bool search_link_idx_is_checked = FALSE; bool search_link_idx_is_checked = FALSE;
for ( for (
......
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