mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
b12e3796dc
- In Maria/MyISAM: Release/re-acquire locks to give queries that wait on them a chance to make progress - In Maria/MyISAM: Change from numeric constants to ICP_RES values. - In Maria: Do check index condition in maria_rprev() (was lost in the merge/backport?) - In Maria/MyISAM/XtraDB: Check if the query was killed, and return immediately if it was. Added new storage engine error: HA_ERR_ABORTED_BY_USER, for handler to signal that it detected a kill of the query and aborted Authors: Sergey Petrunia & Monty include/my_base.h: Added HA_ERR_ABORTED_BY_USER, for handler to signal that it detected a kill of the query and aborted include/my_handler.h: Added comment mysql-test/r/myisam_icp.result: Updated test mysql-test/t/myisam_icp.test: Drop used tables at start of test Added test case that can help with manual testing of killing index condition pushdown query. mysys/my_handler_errors.h: Text for new storage engine error sql/handler.cc: If engine got HA_ERR_ABORTED_BY_USER, send kill message. sql/multi_range_read.cc: Return error code storage/maria/ha_maria.cc: Added ma_killed_in_mariadb() to detect kill. Ensure that file->external_ref points to TABLE object. storage/maria/ma_extra.c: Dummy test-if-killed for standalone storage/maria/ma_key.c: If ma_check_index_cond() fails, set my_errno and info->cur_row.lastpos storage/maria/ma_rkey.c: Release/re-acquire locks to give queries that wait on them a chance to make progress Check if the query was killed, and return immediately if it was storage/maria/ma_rnext.c: Check if the query was killed, and return immediately if it was Added missing fast_ma_writeinfo(info) storage/maria/ma_rnext_same.c: Check if the query was killed, and return immediately if it was Added missing fast_ma_writeinfo(info) storage/maria/ma_rprev.c: Check if the query was killed, and return immediately if it was Added missing fast_ma_writeinfo(info) and ma_check_index_cond() storage/maria/ma_search.c: Give error message if we find a wrong key storage/maria/ma_static.c: Added pointer to test-if-killed function storage/maria/maria_def.h: New prototypes storage/myisam/ha_myisam.cc: Added mi_killed_in_mariadb() Ensure that file->external_ref points to TABLE object. storage/myisam/mi_extra.c: Dummy test-if-killed for standalone storage/myisam/mi_key.c: If ma_check_index_cond() fails, set my_errno and info->lastpos storage/myisam/mi_rkey.c: Ensure that info->lastpos= HA_OFFSET_ERROR in case of error Release/re-acquire locks to give queries that wait on them a chance to make progress Check if the query was killed, and return immediately if it was Reorder code to do less things in case of error. Added missing fast_mi_writeinfo() storage/myisam/mi_rnext.c: Check if the query was killed, and return immediately if it was Simplify old ICP code Added missing fast_ma_writeinfo(info) storage/myisam/mi_rnext_same.c: Check if the query was killed, and return immediately if it was Added missing fast_mi_writeinfo(info) storage/myisam/mi_rprev.c: Check if the query was killed, and return immediately if it was Simplify error handling of ICP Added missing fast_mi_writeinfo(info) storage/myisam/mi_search.c: Give error message if we find a wrong key storage/myisam/mi_static.c: Added pointer to test-if-killed function storage/myisam/myisamdef.h: New prototypes storage/xtradb/handler/ha_innodb.cc: Added DB_SEARCH_ABORTED_BY_USER and ha_innobase::is_thd_killed() Check if the query was killed, and return immediately if it was storage/xtradb/handler/ha_innodb.h: Added prototype storage/xtradb/include/db0err.h: Added DB_SEARCH_ABORTED_BY_USER storage/xtradb/include/row0mysql.h: Added possible ICP errors storage/xtradb/row/row0sel.c: Use ICP errors instead of constants. Detect if killed and return B_SEARCH_ABORTED_BY_USER
122 lines
3.8 KiB
C
122 lines
3.8 KiB
C
/* Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "maria_def.h"
|
|
#include "ma_rt_index.h"
|
|
|
|
/*
|
|
Read next row with the same key as previous read, but abort if
|
|
the key changes.
|
|
One may have done a write, update or delete of the previous row.
|
|
|
|
NOTE! Even if one changes the previous row, the next read is done
|
|
based on the position of the last used key!
|
|
*/
|
|
|
|
int maria_rnext_same(MARIA_HA *info, uchar *buf)
|
|
{
|
|
int error;
|
|
uint inx,not_used[2];
|
|
MARIA_KEYDEF *keyinfo;
|
|
ICP_RESULT icp_res= ICP_MATCH;
|
|
DBUG_ENTER("maria_rnext_same");
|
|
|
|
if ((int) (inx= info->lastinx) < 0 ||
|
|
info->cur_row.lastpos == HA_OFFSET_ERROR)
|
|
DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX);
|
|
if (fast_ma_readinfo(info))
|
|
DBUG_RETURN(my_errno);
|
|
|
|
keyinfo= info->s->keyinfo+inx;
|
|
if (info->s->lock_key_trees)
|
|
rw_rdlock(&keyinfo->root_lock);
|
|
|
|
switch (keyinfo->key_alg) {
|
|
#ifdef HAVE_RTREE_KEYS
|
|
case HA_KEY_ALG_RTREE:
|
|
if ((error=maria_rtree_find_next(info,inx,
|
|
maria_read_vec[info->last_key_func])))
|
|
{
|
|
error=1;
|
|
my_errno=HA_ERR_END_OF_FILE;
|
|
info->cur_row.lastpos= HA_OFFSET_ERROR;
|
|
break;
|
|
}
|
|
break;
|
|
#endif
|
|
case HA_KEY_ALG_BTREE:
|
|
default:
|
|
if (!(info->update & HA_STATE_RNEXT_SAME))
|
|
{
|
|
/* First rnext_same; Store old key */
|
|
memcpy(info->lastkey_buff2, info->last_key.data,
|
|
info->last_rkey_length);
|
|
}
|
|
for (;;)
|
|
{
|
|
if ((error= _ma_search_next(info, &info->last_key,
|
|
SEARCH_BIGGER,
|
|
info->s->state.key_root[inx])))
|
|
break;
|
|
if (ha_key_cmp(keyinfo->seg, info->last_key.data,
|
|
info->lastkey_buff2,
|
|
info->last_rkey_length, SEARCH_FIND,
|
|
not_used))
|
|
{
|
|
error=1;
|
|
my_errno=HA_ERR_END_OF_FILE;
|
|
info->cur_row.lastpos= HA_OFFSET_ERROR;
|
|
break;
|
|
}
|
|
/*
|
|
If we are at the last key on the key page, allow writers to
|
|
access the index.
|
|
*/
|
|
if (info->int_keypos >= info->int_maxpos &&
|
|
ma_yield_and_check_if_killed(info, inx))
|
|
{
|
|
error= 1;
|
|
break;
|
|
}
|
|
/* Skip rows that are inserted by other threads since we got a lock */
|
|
if ((info->s->row_is_visible)(info) &&
|
|
((icp_res= ma_check_index_cond(info, inx, buf)) != ICP_NO_MATCH))
|
|
break;
|
|
}
|
|
}
|
|
if (info->s->lock_key_trees)
|
|
rw_unlock(&keyinfo->root_lock);
|
|
/* Don't clear if database-changed */
|
|
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
|
info->update|= HA_STATE_NEXT_FOUND | HA_STATE_RNEXT_SAME;
|
|
|
|
if (error || icp_res != ICP_MATCH)
|
|
{
|
|
fast_ma_writeinfo(info);
|
|
if (my_errno == HA_ERR_KEY_NOT_FOUND)
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
}
|
|
else if (!buf)
|
|
{
|
|
fast_ma_writeinfo(info);
|
|
DBUG_RETURN(info->cur_row.lastpos == HA_OFFSET_ERROR ? my_errno : 0);
|
|
}
|
|
else if (!(*info->read_record)(info, buf, info->cur_row.lastpos))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
DBUG_RETURN(0);
|
|
}
|
|
DBUG_RETURN(my_errno);
|
|
} /* maria_rnext_same */
|