Skip to content

M
MariaDB
Commit cc0faa1e authored by Yuchen Pei's avatar Yuchen Pei
Browse files
Options

MDEV-31788 Factor functions to reduce duplication around... 

MDEV-31788 Factor functions to reduce duplication around spider_check_and_init_casual_read in ha_spider.cc

factored out static functions:
- spider_prep_loop
- spider_start_bg
- spider_send_queries
parent 0ba97e4d
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 638 deletions
storage/spider/ha_spider.cc
View file @ cc0faa1e
...@@ -1440,15 +1440,117 @@ static int spider_maybe_ping_1(ha_spider *spider, ...@@ -1440,15 +1440,117 @@ static int spider_maybe_ping_1(ha_spider *spider,
return error_num; return error_num;
} }
static void spider_prep_loop(ha_spider *spider, int *roop_start, int *roop_end, int *link_ok)
{
int lock_mode = spider_conn_lock_mode(spider);
if (lock_mode)
{
/* "for update" or "lock in share mode" */
*link_ok = spider_conn_link_idx_next(spider->share->link_statuses,
spider->conn_link_idx, -1, spider->share->link_count,
SPIDER_LINK_STATUS_OK);
*roop_start = spider_conn_link_idx_next(spider->share->link_statuses,
spider->conn_link_idx, -1, spider->share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
*roop_end = spider->share->link_count;
} else {
*link_ok = spider->search_link_idx;
*roop_start = spider->search_link_idx;
*roop_end = spider->search_link_idx + 1;
}
}
#ifndef WITHOUT_SPIDER_BG_SEARCH
/* Returns true if the caller should return *error_num */
static bool spider_start_bg(ha_spider* spider, int roop_count, int roop_start, int link_ok, int *error_num)
{
if ((*error_num = spider_check_and_init_casual_read(
spider->wide_handler->trx->thd, spider,
roop_count)))
return true;
if ((*error_num = spider_bg_conn_search(spider, roop_count, roop_start,
TRUE, FALSE, (roop_count != link_ok))))
{
if (
*error_num != HA_ERR_END_OF_FILE
) {
*error_num= spider_maybe_ping(spider, roop_count, *error_num);
return true;
}
*error_num= spider->check_error_mode_eof(*error_num);
return true;
}
return false;
}
#endif
/* Updates error_num. Returning true if the caller should return. */
static bool spider_send_query(ha_spider *spider, TABLE *table, int link_idx, int link_ok, int *error_num)
{
ulong sql_type;
SPIDER_CONN *conn = spider->conns[link_idx];
if (spider->sql_kind[link_idx] == SPIDER_SQL_KIND_SQL)
{
sql_type = SPIDER_SQL_TYPE_SELECT_SQL;
} else {
sql_type = SPIDER_SQL_TYPE_HANDLER;
}
spider_db_handler *dbton_hdl = spider->dbton_handler[conn->dbton_id];
if ((*error_num = dbton_hdl->set_sql_for_exec(sql_type, link_idx)))
{
return true;
}
DBUG_PRINT("info",("spider sql_type=%lu", sql_type));
spider_lock_before_query(conn, &spider->need_mons[link_idx]);
if ((*error_num = spider_db_set_names(spider, conn,
link_idx)))
{
spider_unlock_after_query(conn, 0);
*error_num= spider_maybe_ping(spider, link_idx, *error_num);
return true;
}
spider_conn_set_timeout_from_share(conn, link_idx,
spider->wide_handler->trx->thd, spider->share);
if (dbton_hdl->execute_sql(
sql_type,
conn,
spider->result_list.quick_mode,
&spider->need_mons[link_idx])
) {
*error_num= spider_unlock_after_query_1(conn);
*error_num= (spider_maybe_ping(spider, link_idx, *error_num));
return true;
}
spider->connection_ids[link_idx] = conn->connection_id;
if (link_idx == link_ok)
{
if ((*error_num = spider_unlock_after_query_2(conn, spider, link_idx, table)))
{
if (
*error_num != HA_ERR_END_OF_FILE
) {
*error_num= spider_maybe_ping(spider, link_idx, *error_num);
return true;
}
*error_num= spider->check_error_mode_eof(*error_num);
return true;
}
spider->result_link_idx = link_ok;
} else {
spider_db_discard_result(spider, link_idx, conn);
spider_unlock_after_query(conn, 0);
}
return false;
}
int ha_spider::index_read_map_internal( int ha_spider::index_read_map_internal(
uchar *buf, uchar *buf,
const uchar *key, const uchar *key,
key_part_map keypart_map, key_part_map keypart_map,
enum ha_rkey_function find_flag enum ha_rkey_function find_flag
) { ) {
int error_num, roop_count; int error_num;
key_range start_key; key_range start_key;
SPIDER_CONN *conn;
backup_error_status(); backup_error_status();
DBUG_ENTER("ha_spider::index_read_map_internal"); DBUG_ENTER("ha_spider::index_read_map_internal");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
...@@ -1570,24 +1672,8 @@ int ha_spider::index_read_map_internal( ...@@ -1570,24 +1672,8 @@ int ha_spider::index_read_map_internal(
} }
} }
/* Query execution */ int roop_start, roop_end, roop_count, link_ok;
int roop_start, roop_end, lock_mode, link_ok; spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
lock_mode = spider_conn_lock_mode(this);
if (lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
...@@ -1596,71 +1682,12 @@ int ha_spider::index_read_map_internal( ...@@ -1596,71 +1682,12 @@ int ha_spider::index_read_map_internal(
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
if (result_list.bgs_phase > 0) if (result_list.bgs_phase > 0)
{ {
if ((error_num = spider_check_and_init_casual_read( if (spider_start_bg(this, roop_count, roop_start, link_ok, &error_num))
wide_handler->trx->thd, this,
roop_count)))
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
if ((error_num = spider_bg_conn_search(this, roop_count, roop_start,
TRUE, FALSE, (roop_count != link_ok))))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
} else { } else {
#endif #endif
ulong sql_type; if (spider_send_query(this, table, roop_count, link_ok, &error_num))
conn = conns[roop_count];
if (sql_kind[roop_count] == SPIDER_SQL_KIND_SQL)
{
sql_type = SPIDER_SQL_TYPE_SELECT_SQL;
} else {
sql_type = SPIDER_SQL_TYPE_HANDLER;
}
spider_db_handler *dbton_hdl = dbton_handler[conn->dbton_id];
if ((error_num = dbton_hdl->set_sql_for_exec(sql_type, roop_count)))
{
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
}
DBUG_PRINT("info",("spider sql_type=%lu", sql_type));
spider_lock_before_query(conn, &need_mons[roop_count]);
if ((error_num = spider_db_set_names(this, conn,
roop_count)))
{
spider_unlock_after_query(conn, 0);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
spider_conn_set_timeout_from_share(conn, roop_count,
wide_handler->trx->thd, share);
if (dbton_hdl->execute_sql(
sql_type,
conn,
result_list.quick_mode,
&need_mons[roop_count])
) {
error_num= spider_unlock_after_query_1(conn);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
connection_ids[roop_count] = conn->connection_id;
if (roop_count == link_ok)
{
if ((error_num = spider_unlock_after_query_2(conn, this, roop_count, table)))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
result_link_idx = link_ok;
} else {
spider_db_discard_result(this, roop_count, conn);
spider_unlock_after_query(conn, 0);
}
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
} }
#endif #endif
...@@ -1726,7 +1753,6 @@ int ha_spider::index_read_last_map_internal( ...@@ -1726,7 +1753,6 @@ int ha_spider::index_read_last_map_internal(
) { ) {
int error_num; int error_num;
key_range start_key; key_range start_key;
SPIDER_CONN *conn;
backup_error_status(); backup_error_status();
DBUG_ENTER("ha_spider::index_read_last_map_internal"); DBUG_ENTER("ha_spider::index_read_last_map_internal");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
...@@ -1837,23 +1863,8 @@ int ha_spider::index_read_last_map_internal( ...@@ -1837,23 +1863,8 @@ int ha_spider::index_read_last_map_internal(
} }
} }
int roop_start, roop_end, roop_count, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
...@@ -1862,71 +1873,12 @@ int ha_spider::index_read_last_map_internal( ...@@ -1862,71 +1873,12 @@ int ha_spider::index_read_last_map_internal(
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
if (result_list.bgs_phase > 0) if (result_list.bgs_phase > 0)
{ {
if ((error_num = spider_check_and_init_casual_read( if (spider_start_bg(this, roop_count, roop_start, link_ok, &error_num))
wide_handler->trx->thd, this,
roop_count)))
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
if ((error_num = spider_bg_conn_search(this, roop_count, roop_start,
TRUE, FALSE, (roop_count != link_ok))))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
} else { } else {
#endif #endif
ulong sql_type; if (spider_send_query(this, table, roop_count, link_ok, &error_num))
conn = conns[roop_count];
if (sql_kind[roop_count] == SPIDER_SQL_KIND_SQL)
{
sql_type = SPIDER_SQL_TYPE_SELECT_SQL;
} else {
sql_type = SPIDER_SQL_TYPE_HANDLER;
}
spider_db_handler *dbton_hdl = dbton_handler[conn->dbton_id];
if ((error_num = dbton_hdl->set_sql_for_exec(sql_type, roop_count)))
{
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
}
DBUG_PRINT("info",("spider sql_type=%lu", sql_type));
spider_lock_before_query(conn, &need_mons[roop_count]);
if ((error_num = spider_db_set_names(this, conn,
roop_count)))
{
spider_unlock_after_query(conn, 0);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
spider_conn_set_timeout_from_share(conn, roop_count,
wide_handler->trx->thd, share);
if (dbton_hdl->execute_sql(
sql_type,
conn,
result_list.quick_mode,
&need_mons[roop_count])
) {
error_num= spider_unlock_after_query_1(conn);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
connection_ids[roop_count] = conn->connection_id;
if (roop_count == link_ok)
{
if ((error_num = spider_unlock_after_query_2(conn, this, roop_count, table)))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
result_link_idx = link_ok;
} else {
spider_db_discard_result(this, roop_count, conn);
spider_unlock_after_query(conn, 0);
}
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
} }
#endif #endif
...@@ -2043,7 +1995,6 @@ int ha_spider::index_first_internal( ...@@ -2043,7 +1995,6 @@ int ha_spider::index_first_internal(
uchar *buf uchar *buf
) { ) {
int error_num; int error_num;
SPIDER_CONN *conn;
backup_error_status(); backup_error_status();
DBUG_ENTER("ha_spider::index_first_internal"); DBUG_ENTER("ha_spider::index_first_internal");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
...@@ -2152,97 +2103,22 @@ int ha_spider::index_first_internal( ...@@ -2152,97 +2103,22 @@ int ha_spider::index_first_internal(
} }
} }
int roop_start, roop_end, roop_count, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
SPIDER_LINK_STATUS_RECOVERY) SPIDER_LINK_STATUS_RECOVERY)
) { ) {
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
if (result_list.bgs_phase > 0) if (result_list.bgs_phase > 0)
{ {
if ((error_num = spider_check_and_init_casual_read( if (spider_start_bg(this, roop_count, roop_start, link_ok, &error_num))
wide_handler->trx->thd, this, DBUG_RETURN(error_num);
roop_count))) } else {
DBUG_RETURN(error_num);
if ((error_num = spider_bg_conn_search(this, roop_count, roop_start,
TRUE, FALSE, (roop_count != link_ok))))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
} else {
#endif #endif
ulong sql_type; if (spider_send_query(this, table, roop_count, link_ok, &error_num))
conn = conns[roop_count]; DBUG_RETURN(error_num);
if (sql_kind[roop_count] == SPIDER_SQL_KIND_SQL)
{
sql_type = SPIDER_SQL_TYPE_SELECT_SQL;
} else {
sql_type = SPIDER_SQL_TYPE_HANDLER;
}
spider_db_handler *dbton_hdl = dbton_handler[conn->dbton_id];
if ((error_num =
dbton_hdl->set_sql_for_exec(sql_type, roop_count)))
{
DBUG_RETURN(error_num);
}
DBUG_PRINT("info",("spider sql_type=%lu", sql_type));
spider_lock_before_query(conn, &need_mons[roop_count]);
if ((error_num = spider_db_set_names(this, conn,
roop_count)))
{
spider_unlock_after_query(conn, 0);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
spider_conn_set_timeout_from_share(conn, roop_count,
wide_handler->trx->thd, share);
if (dbton_hdl->execute_sql(
sql_type,
conn,
result_list.quick_mode,
&need_mons[roop_count])
) {
error_num= spider_unlock_after_query_1(conn);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
connection_ids[roop_count] = conn->connection_id;
if (roop_count == link_ok)
{
if ((error_num = spider_unlock_after_query_2(conn, this, roop_count, table)))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
result_link_idx = link_ok;
} else {
spider_db_discard_result(this, roop_count, conn);
spider_unlock_after_query(conn, 0);
}
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
} }
#endif #endif
...@@ -2306,7 +2182,6 @@ int ha_spider::index_last_internal( ...@@ -2306,7 +2182,6 @@ int ha_spider::index_last_internal(
uchar *buf uchar *buf
) { ) {
int error_num; int error_num;
SPIDER_CONN *conn;
backup_error_status(); backup_error_status();
DBUG_ENTER("ha_spider::index_last_internal"); DBUG_ENTER("ha_spider::index_last_internal");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
...@@ -2415,97 +2290,22 @@ int ha_spider::index_last_internal( ...@@ -2415,97 +2290,22 @@ int ha_spider::index_last_internal(
} }
} }
int roop_start, roop_end, roop_count, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
SPIDER_LINK_STATUS_RECOVERY) SPIDER_LINK_STATUS_RECOVERY)
) { ) {
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
if (result_list.bgs_phase > 0) if (result_list.bgs_phase > 0)
{ {
if ((error_num = spider_check_and_init_casual_read( if (spider_start_bg(this, roop_count, roop_start, link_ok, &error_num))
wide_handler->trx->thd, this, DBUG_RETURN(error_num);
roop_count))) } else {
DBUG_RETURN(error_num);
if ((error_num = spider_bg_conn_search(this, roop_count, roop_start,
TRUE, FALSE, (roop_count != link_ok))))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
} else {
#endif #endif
ulong sql_type; if (spider_send_query(this, table, roop_count, link_ok, &error_num))
conn = conns[roop_count]; DBUG_RETURN(error_num);
if (sql_kind[roop_count] == SPIDER_SQL_KIND_SQL)
{
sql_type = SPIDER_SQL_TYPE_SELECT_SQL;
} else {
sql_type = SPIDER_SQL_TYPE_HANDLER;
}
spider_db_handler *dbton_hdl = dbton_handler[conn->dbton_id];
if ((error_num =
dbton_hdl->set_sql_for_exec(sql_type, roop_count)))
{
DBUG_RETURN(error_num);
}
DBUG_PRINT("info",("spider sql_type=%lu", sql_type));
spider_lock_before_query(conn, &need_mons[roop_count]);
if ((error_num = spider_db_set_names(this, conn,
roop_count)))
{
spider_unlock_after_query(conn, 0);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
spider_conn_set_timeout_from_share(conn, roop_count,
wide_handler->trx->thd, share);
if (dbton_hdl->execute_sql(
sql_type,
conn,
result_list.quick_mode,
&need_mons[roop_count])
) {
error_num= spider_unlock_after_query_1(conn);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
connection_ids[roop_count] = conn->connection_id;
if (roop_count == link_ok)
{
if ((error_num = spider_unlock_after_query_2(conn, this, roop_count, table)))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
result_link_idx = link_ok;
} else {
spider_db_discard_result(this, roop_count, conn);
spider_unlock_after_query(conn, 0);
}
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
} }
#endif #endif
...@@ -2606,7 +2406,6 @@ int ha_spider::read_range_first_internal( ...@@ -2606,7 +2406,6 @@ int ha_spider::read_range_first_internal(
bool sorted bool sorted
) { ) {
int error_num; int error_num;
SPIDER_CONN *conn;
backup_error_status(); backup_error_status();
DBUG_ENTER("ha_spider::read_range_first_internal"); DBUG_ENTER("ha_spider::read_range_first_internal");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
...@@ -2721,23 +2520,8 @@ int ha_spider::read_range_first_internal( ...@@ -2721,23 +2520,8 @@ int ha_spider::read_range_first_internal(
} }
} }
int roop_start, roop_end, roop_count, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
...@@ -2746,71 +2530,12 @@ int ha_spider::read_range_first_internal( ...@@ -2746,71 +2530,12 @@ int ha_spider::read_range_first_internal(
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
if (result_list.bgs_phase > 0) if (result_list.bgs_phase > 0)
{ {
if ((error_num = spider_check_and_init_casual_read( if (spider_start_bg(this, roop_count, roop_start, link_ok, &error_num))
wide_handler->trx->thd, this,
roop_count)))
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
if ((error_num = spider_bg_conn_search(this, roop_count, roop_start,
TRUE, FALSE, (roop_count != link_ok))))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
} else { } else {
#endif #endif
ulong sql_type; if (spider_send_query(this, table, roop_count, link_ok, &error_num))
conn = conns[roop_count];
if (sql_kind[roop_count] == SPIDER_SQL_KIND_SQL)
{
sql_type = SPIDER_SQL_TYPE_SELECT_SQL;
} else {
sql_type = SPIDER_SQL_TYPE_HANDLER;
}
spider_db_handler *dbton_hdl = dbton_handler[conn->dbton_id];
if ((error_num = dbton_hdl->set_sql_for_exec(sql_type, roop_count)))
{
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
}
DBUG_PRINT("info",("spider sql_type=%lu", sql_type));
spider_lock_before_query(conn, &need_mons[roop_count]);
if ((error_num = spider_db_set_names(this, conn,
roop_count)))
{
spider_unlock_after_query(conn, 0);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
spider_conn_set_timeout_from_share(conn, roop_count,
wide_handler->trx->thd, share);
if (dbton_hdl->execute_sql(
sql_type,
conn,
result_list.quick_mode,
&need_mons[roop_count])
) {
error_num= spider_unlock_after_query_1(conn);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
connection_ids[roop_count] = conn->connection_id;
if (roop_count == link_ok)
{
if ((error_num = spider_unlock_after_query_2(conn, this, roop_count, table)))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
result_link_idx = link_ok;
} else {
spider_db_discard_result(this, roop_count, conn);
spider_unlock_after_query(conn, 0);
}
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
} }
#endif #endif
...@@ -3226,23 +2951,8 @@ int ha_spider::read_multi_range_first_internal( ...@@ -3226,23 +2951,8 @@ int ha_spider::read_multi_range_first_internal(
} }
} }
int roop_start, roop_end, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
...@@ -3886,24 +3596,8 @@ int ha_spider::read_multi_range_first_internal( ...@@ -3886,24 +3596,8 @@ int ha_spider::read_multi_range_first_internal(
} }
} }
int roop_start, roop_end, roop_count, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
...@@ -4387,23 +4081,8 @@ int ha_spider::read_multi_range_next( ...@@ -4387,23 +4081,8 @@ int ha_spider::read_multi_range_next(
} }
} }
int roop_start, roop_end, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
...@@ -5047,23 +4726,8 @@ int ha_spider::read_multi_range_next( ...@@ -5047,23 +4726,8 @@ int ha_spider::read_multi_range_next(
} }
} }
int roop_start, roop_end, roop_count, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
...@@ -5550,97 +5214,22 @@ int ha_spider::rnd_next_internal( ...@@ -5550,97 +5214,22 @@ int ha_spider::rnd_next_internal(
} }
} }
int roop_start, roop_end, roop_count, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
SPIDER_LINK_STATUS_RECOVERY) SPIDER_LINK_STATUS_RECOVERY)
) { ) {
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
if (result_list.bgs_phase > 0) if (result_list.bgs_phase > 0)
{ {
if ((error_num = spider_check_and_init_casual_read( if (spider_start_bg(this, roop_count, roop_start, link_ok, &error_num))
wide_handler->trx->thd, this, DBUG_RETURN(error_num);
roop_count))) } else {
DBUG_RETURN(error_num);
if ((error_num = spider_bg_conn_search(this, roop_count, roop_start,
TRUE, FALSE, (roop_count != link_ok))))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
} else {
#endif #endif
SPIDER_CONN *conn = conns[roop_count]; if (spider_send_query(this, table, roop_count, link_ok, &error_num))
ulong sql_type; DBUG_RETURN(error_num);
if (sql_kind[roop_count] == SPIDER_SQL_KIND_SQL)
{
sql_type = SPIDER_SQL_TYPE_SELECT_SQL;
} else {
sql_type = SPIDER_SQL_TYPE_HANDLER;
}
spider_db_handler *dbton_hdl = dbton_handler[conn->dbton_id];
if ((error_num =
dbton_hdl->set_sql_for_exec(sql_type, roop_count)))
{
DBUG_RETURN(error_num);
}
DBUG_PRINT("info",("spider sql_type=%lu", sql_type));
spider_lock_before_query(conn, &need_mons[roop_count]);
if ((error_num = spider_db_set_names(this, conn,
roop_count)))
{
spider_unlock_after_query(conn, 0);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
spider_conn_set_timeout_from_share(conn, roop_count,
wide_handler->trx->thd, share);
if (dbton_hdl->execute_sql(
sql_type,
conn,
result_list.quick_mode,
&need_mons[roop_count])
) {
error_num= spider_unlock_after_query_1(conn);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
connection_ids[roop_count] = conn->connection_id;
if (roop_count == link_ok)
{
if ((error_num = spider_unlock_after_query_2(conn, this, roop_count, table)))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
result_link_idx = link_ok;
} else {
spider_db_discard_result(this, roop_count, conn);
spider_unlock_after_query(conn, 0);
}
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
} }
#endif #endif
...@@ -6077,89 +5666,22 @@ int ha_spider::ft_read_internal( ...@@ -6077,89 +5666,22 @@ int ha_spider::ft_read_internal(
} }
} }
int roop_start, roop_end, roop_count, tmp_lock_mode, link_ok; int roop_start, roop_end, roop_count, link_ok;
tmp_lock_mode = spider_conn_lock_mode(this); spider_prep_loop(this, &roop_start, &roop_end, &link_ok);
if (tmp_lock_mode)
{
/* "for update" or "lock in share mode" */
link_ok = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_OK);
roop_start = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, -1, share->link_count,
SPIDER_LINK_STATUS_RECOVERY);
roop_end = share->link_count;
} else {
link_ok = search_link_idx;
roop_start = search_link_idx;
roop_end = search_link_idx + 1;
}
for (roop_count = roop_start; roop_count < roop_end; for (roop_count = roop_start; roop_count < roop_end;
roop_count = spider_conn_link_idx_next(share->link_statuses, roop_count = spider_conn_link_idx_next(share->link_statuses,
conn_link_idx, roop_count, share->link_count, conn_link_idx, roop_count, share->link_count,
SPIDER_LINK_STATUS_RECOVERY) SPIDER_LINK_STATUS_RECOVERY)
) { ) {
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
if (result_list.bgs_phase > 0) if (result_list.bgs_phase > 0)
{ {
if ((error_num = spider_check_and_init_casual_read( if (spider_start_bg(this, roop_count, roop_start, link_ok, &error_num))
wide_handler->trx->thd, this, DBUG_RETURN(error_num);
roop_count))) } else {
DBUG_RETURN(error_num);
if ((error_num = spider_bg_conn_search(this, roop_count, roop_start,
TRUE, FALSE, (roop_count != link_ok))))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
} else {
#endif #endif
uint dbton_id = share->sql_dbton_ids[roop_count]; if (spider_send_query(this, table, roop_count, link_ok, &error_num))
spider_db_handler *dbton_hdl = dbton_handler[dbton_id]; DBUG_RETURN(error_num);
SPIDER_CONN *conn = conns[roop_count];
if ((error_num = dbton_hdl->set_sql_for_exec(
SPIDER_SQL_TYPE_SELECT_SQL, roop_count)))
{
DBUG_RETURN(error_num);
}
spider_lock_before_query(conn, &need_mons[roop_count]);
if ((error_num = spider_db_set_names(this, conn, roop_count)))
{
spider_unlock_after_query(conn, 0);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
spider_conn_set_timeout_from_share(conn, roop_count,
wide_handler->trx->thd, share);
if (dbton_hdl->execute_sql(
SPIDER_SQL_TYPE_SELECT_SQL,
conn,
result_list.quick_mode,
&need_mons[roop_count])
) {
error_num= spider_unlock_after_query_1(conn);
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
connection_ids[roop_count] = conn->connection_id;
if (roop_count == link_ok)
{
if ((error_num = spider_unlock_after_query_2(conn, this, roop_count, table)))
{
if (
error_num != HA_ERR_END_OF_FILE
) {
DBUG_RETURN(spider_maybe_ping(this, roop_count, error_num));
}
DBUG_RETURN(check_error_mode_eof(error_num));
}
result_link_idx = link_ok;
} else {
spider_db_discard_result(this, roop_count, conn);
spider_unlock_after_query(conn, 0);
}
#ifndef WITHOUT_SPIDER_BG_SEARCH #ifndef WITHOUT_SPIDER_BG_SEARCH
} }
#endif #endif
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7