Commit e7570c77 authored by Yuchen Pei's avatar Yuchen Pei

MDEV-31788 Remove spider_file_pos

They are for unnecessary debugging purposes only.
parent a81f419b
This diff is collapsed.
...@@ -276,7 +276,6 @@ int spider_free_conn_alloc( ...@@ -276,7 +276,6 @@ int spider_free_conn_alloc(
conn->db_conn = NULL; conn->db_conn = NULL;
} }
spider_conn_done(conn); spider_conn_done(conn);
DBUG_ASSERT(!conn->mta_conn_mutex_file_pos.file_name);
pthread_mutex_destroy(&conn->mta_conn_mutex); pthread_mutex_destroy(&conn->mta_conn_mutex);
conn->default_database.free(); conn->default_database.free();
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -1458,10 +1457,6 @@ void spider_conn_clear_queue( ...@@ -1458,10 +1457,6 @@ void spider_conn_clear_queue(
) { ) {
DBUG_ENTER("spider_conn_clear_queue"); DBUG_ENTER("spider_conn_clear_queue");
DBUG_PRINT("info", ("spider conn=%p", conn)); DBUG_PRINT("info", ("spider conn=%p", conn));
/*
conn->queued_connect = FALSE;
conn->queued_ping = FALSE;
*/
conn->queued_trx_isolation = FALSE; conn->queued_trx_isolation = FALSE;
conn->queued_semi_trx_isolation = FALSE; conn->queued_semi_trx_isolation = FALSE;
conn->queued_autocommit = FALSE; conn->queued_autocommit = FALSE;
...@@ -2593,7 +2588,6 @@ void *spider_bg_conn_action( ...@@ -2593,7 +2588,6 @@ void *spider_bg_conn_action(
} }
} }
pthread_mutex_lock(&conn->mta_conn_mutex); pthread_mutex_lock(&conn->mta_conn_mutex);
SPIDER_SET_FILE_POS(&conn->mta_conn_mutex_file_pos);
sql_type &= ~SPIDER_SQL_TYPE_TMP_SQL; sql_type &= ~SPIDER_SQL_TYPE_TMP_SQL;
DBUG_PRINT("info",("spider sql_type=%lu", sql_type)); DBUG_PRINT("info",("spider sql_type=%lu", sql_type));
#ifdef HA_CAN_BULK_ACCESS #ifdef HA_CAN_BULK_ACCESS
...@@ -2689,10 +2683,8 @@ void *spider_bg_conn_action( ...@@ -2689,10 +2683,8 @@ void *spider_bg_conn_action(
DBUG_ASSERT(conn->mta_conn_mutex_unlock_later); DBUG_ASSERT(conn->mta_conn_mutex_unlock_later);
conn->mta_conn_mutex_lock_already = FALSE; conn->mta_conn_mutex_lock_already = FALSE;
conn->mta_conn_mutex_unlock_later = FALSE; conn->mta_conn_mutex_unlock_later = FALSE;
SPIDER_CLEAR_FILE_POS(&conn->mta_conn_mutex_file_pos);
pthread_mutex_unlock(&conn->mta_conn_mutex); pthread_mutex_unlock(&conn->mta_conn_mutex);
} else { } else {
SPIDER_CLEAR_FILE_POS(&conn->mta_conn_mutex_file_pos);
pthread_mutex_unlock(&conn->mta_conn_mutex); pthread_mutex_unlock(&conn->mta_conn_mutex);
} }
} else { } else {
...@@ -2770,7 +2762,6 @@ void *spider_bg_conn_action( ...@@ -2770,7 +2762,6 @@ void *spider_bg_conn_action(
spider = (ha_spider*) conn->bg_target; spider = (ha_spider*) conn->bg_target;
pthread_mutex_assert_not_owner(&conn->mta_conn_mutex); pthread_mutex_assert_not_owner(&conn->mta_conn_mutex);
pthread_mutex_lock(&conn->mta_conn_mutex); pthread_mutex_lock(&conn->mta_conn_mutex);
SPIDER_SET_FILE_POS(&conn->mta_conn_mutex_file_pos);
conn->need_mon = &spider->need_mons[conn->link_idx]; conn->need_mon = &spider->need_mons[conn->link_idx];
DBUG_ASSERT(!conn->mta_conn_mutex_lock_already); DBUG_ASSERT(!conn->mta_conn_mutex_lock_already);
DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later); DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later);
...@@ -2786,7 +2777,6 @@ void *spider_bg_conn_action( ...@@ -2786,7 +2777,6 @@ void *spider_bg_conn_action(
DBUG_ASSERT(conn->mta_conn_mutex_unlock_later); DBUG_ASSERT(conn->mta_conn_mutex_unlock_later);
conn->mta_conn_mutex_lock_already = FALSE; conn->mta_conn_mutex_lock_already = FALSE;
conn->mta_conn_mutex_unlock_later = FALSE; conn->mta_conn_mutex_unlock_later = FALSE;
SPIDER_CLEAR_FILE_POS(&conn->mta_conn_mutex_file_pos);
pthread_mutex_unlock(&conn->mta_conn_mutex); pthread_mutex_unlock(&conn->mta_conn_mutex);
conn->bg_exec_sql = FALSE; conn->bg_exec_sql = FALSE;
continue; continue;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -477,7 +477,6 @@ SPIDER_CONN *spider_udf_direct_sql_create_conn( ...@@ -477,7 +477,6 @@ SPIDER_CONN *spider_udf_direct_sql_create_conn(
DBUG_RETURN(conn); DBUG_RETURN(conn);
error: error:
DBUG_ASSERT(!conn->mta_conn_mutex_file_pos.file_name);
error_too_many_ipport_count: error_too_many_ipport_count:
spider_conn_done(conn); spider_conn_done(conn);
error_conn_init: error_conn_init:
......
...@@ -1196,7 +1196,6 @@ static int spider_send_query( ...@@ -1196,7 +1196,6 @@ static int spider_send_query(
SPIDER_SQL_TYPE_SELECT_SQL, link_idx, link_idx_chain))) SPIDER_SQL_TYPE_SELECT_SQL, link_idx, link_idx_chain)))
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
pthread_mutex_lock(&conn->mta_conn_mutex); pthread_mutex_lock(&conn->mta_conn_mutex);
SPIDER_SET_FILE_POS(&conn->mta_conn_mutex_file_pos);
conn->need_mon = &spider->need_mons[link_idx]; conn->need_mon = &spider->need_mons[link_idx];
DBUG_ASSERT(!conn->mta_conn_mutex_lock_already); DBUG_ASSERT(!conn->mta_conn_mutex_lock_already);
DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later); DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later);
...@@ -1210,7 +1209,6 @@ static int spider_send_query( ...@@ -1210,7 +1209,6 @@ static int spider_send_query(
DBUG_ASSERT(conn->mta_conn_mutex_unlock_later); DBUG_ASSERT(conn->mta_conn_mutex_unlock_later);
conn->mta_conn_mutex_lock_already = FALSE; conn->mta_conn_mutex_lock_already = FALSE;
conn->mta_conn_mutex_unlock_later = FALSE; conn->mta_conn_mutex_unlock_later = FALSE;
SPIDER_CLEAR_FILE_POS(&conn->mta_conn_mutex_file_pos);
pthread_mutex_unlock(&conn->mta_conn_mutex); pthread_mutex_unlock(&conn->mta_conn_mutex);
if (spider->need_mons[link_idx]) if (spider->need_mons[link_idx])
error_num = fields->ping_table_mon_from_table(link_idx_chain); error_num = fields->ping_table_mon_from_table(link_idx_chain);
...@@ -1268,7 +1266,6 @@ static int spider_send_query( ...@@ -1268,7 +1266,6 @@ static int spider_send_query(
} else } else
{ {
spider_db_discard_result(spider, link_idx, conn); spider_db_discard_result(spider, link_idx, conn);
SPIDER_CLEAR_FILE_POS(&conn->mta_conn_mutex_file_pos);
pthread_mutex_unlock(&conn->mta_conn_mutex); pthread_mutex_unlock(&conn->mta_conn_mutex);
} }
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
......
...@@ -453,11 +453,6 @@ enum spider_malloc_id { ...@@ -453,11 +453,6 @@ enum spider_malloc_id {
#define SPIDER_CONN_RESTORE_DASTATUS_AND_RESET_TMP_ERROR_NUM \ #define SPIDER_CONN_RESTORE_DASTATUS_AND_RESET_TMP_ERROR_NUM \
if (thd && conn->error_mode) {SPIDER_RESTORE_DASTATUS; tmp_error_num = 0;} if (thd && conn->error_mode) {SPIDER_RESTORE_DASTATUS; tmp_error_num = 0;}
#define SPIDER_SET_FILE_POS(A) \
{(A)->thd = current_thd; (A)->func_name = __func__; (A)->file_name = __FILE__; (A)->line_no = __LINE__;}
#define SPIDER_CLEAR_FILE_POS(A) \
{DBUG_PRINT("info", ("spider thd=%p func_name=%s file_name=%s line_no=%lu", (A)->thd, (A)->func_name ? (A)->func_name : "NULL", (A)->file_name ? (A)->file_name : "NULL", (A)->line_no)); (A)->thd = NULL; (A)->func_name = NULL; (A)->file_name = NULL; (A)->line_no = 0;}
class ha_spider; class ha_spider;
typedef struct st_spider_share SPIDER_SHARE; typedef struct st_spider_share SPIDER_SHARE;
typedef struct st_spider_table_mon_list SPIDER_TABLE_MON_LIST; typedef struct st_spider_table_mon_list SPIDER_TABLE_MON_LIST;
...@@ -481,14 +476,6 @@ typedef struct st_spider_thread ...@@ -481,14 +476,6 @@ typedef struct st_spider_thread
} SPIDER_THREAD; } SPIDER_THREAD;
#endif #endif
typedef struct st_spider_file_pos
{
THD *thd;
const char *func_name;
const char *file_name;
ulong line_no;
} SPIDER_FILE_POS;
typedef struct st_spider_link_for_hash typedef struct st_spider_link_for_hash
{ {
ha_spider *spider; ha_spider *spider;
...@@ -610,7 +597,6 @@ typedef struct st_spider_conn ...@@ -610,7 +597,6 @@ typedef struct st_spider_conn
pthread_mutex_t mta_conn_mutex; pthread_mutex_t mta_conn_mutex;
volatile bool mta_conn_mutex_lock_already; volatile bool mta_conn_mutex_lock_already;
volatile bool mta_conn_mutex_unlock_later; volatile bool mta_conn_mutex_unlock_later;
SPIDER_FILE_POS mta_conn_mutex_file_pos;
uint join_trx; uint join_trx;
int trx_isolation; int trx_isolation;
bool semi_trx_isolation_chk; bool semi_trx_isolation_chk;
......
...@@ -5741,7 +5741,6 @@ int spider_open_all_tables( ...@@ -5741,7 +5741,6 @@ int spider_open_all_tables(
conn->error_mode &= spider_param_error_write_mode(thd, 0); conn->error_mode &= spider_param_error_write_mode(thd, 0);
pthread_mutex_assert_not_owner(&conn->mta_conn_mutex); pthread_mutex_assert_not_owner(&conn->mta_conn_mutex);
pthread_mutex_lock(&conn->mta_conn_mutex); pthread_mutex_lock(&conn->mta_conn_mutex);
SPIDER_SET_FILE_POS(&conn->mta_conn_mutex_file_pos);
conn->need_mon = &mon_val; conn->need_mon = &mon_val;
DBUG_ASSERT(!conn->mta_conn_mutex_lock_already); DBUG_ASSERT(!conn->mta_conn_mutex_lock_already);
DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later); DBUG_ASSERT(!conn->mta_conn_mutex_unlock_later);
...@@ -5753,7 +5752,6 @@ int spider_open_all_tables( ...@@ -5753,7 +5752,6 @@ int spider_open_all_tables(
DBUG_ASSERT(conn->mta_conn_mutex_unlock_later); DBUG_ASSERT(conn->mta_conn_mutex_unlock_later);
conn->mta_conn_mutex_lock_already = FALSE; conn->mta_conn_mutex_lock_already = FALSE;
conn->mta_conn_mutex_unlock_later = FALSE; conn->mta_conn_mutex_unlock_later = FALSE;
SPIDER_CLEAR_FILE_POS(&conn->mta_conn_mutex_file_pos);
pthread_mutex_unlock(&conn->mta_conn_mutex); pthread_mutex_unlock(&conn->mta_conn_mutex);
spider_sys_index_end(table_tables); spider_sys_index_end(table_tables);
spider_close_sys_table(thd, table_tables, spider_close_sys_table(thd, table_tables,
...@@ -5767,7 +5765,6 @@ int spider_open_all_tables( ...@@ -5767,7 +5765,6 @@ int spider_open_all_tables(
DBUG_ASSERT(conn->mta_conn_mutex_unlock_later); DBUG_ASSERT(conn->mta_conn_mutex_unlock_later);
conn->mta_conn_mutex_lock_already = FALSE; conn->mta_conn_mutex_lock_already = FALSE;
conn->mta_conn_mutex_unlock_later = FALSE; conn->mta_conn_mutex_unlock_later = FALSE;
SPIDER_CLEAR_FILE_POS(&conn->mta_conn_mutex_file_pos);
pthread_mutex_unlock(&conn->mta_conn_mutex); pthread_mutex_unlock(&conn->mta_conn_mutex);
if (lock && spider_param_use_snapshot_with_flush_tables(thd) == 2) if (lock && spider_param_use_snapshot_with_flush_tables(thd) == 2)
......
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