mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +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
156 lines
4.7 KiB
C
156 lines
4.7 KiB
C
/* Copyright (C) 2000-2004 MySQL 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 "myisamdef.h"
|
|
|
|
#include "rt_index.h"
|
|
|
|
/*
|
|
Read next row with the same key as previous read
|
|
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 mi_rnext(MI_INFO *info, uchar *buf, int inx)
|
|
{
|
|
int error,changed;
|
|
uint flag;
|
|
ICP_RESULT icp_res= ICP_MATCH;
|
|
uint update_mask= HA_STATE_NEXT_FOUND;
|
|
DBUG_ENTER("mi_rnext");
|
|
|
|
if ((inx = _mi_check_index(info,inx)) < 0)
|
|
DBUG_RETURN(my_errno);
|
|
flag=SEARCH_BIGGER; /* Read next */
|
|
if (info->lastpos == HA_OFFSET_ERROR && info->update & HA_STATE_PREV_FOUND)
|
|
flag=0; /* Read first */
|
|
|
|
if (fast_mi_readinfo(info))
|
|
DBUG_RETURN(my_errno);
|
|
if (info->s->concurrent_insert)
|
|
rw_rdlock(&info->s->key_root_lock[inx]);
|
|
changed=_mi_test_if_changed(info);
|
|
if (!flag)
|
|
{
|
|
switch(info->s->keyinfo[inx].key_alg){
|
|
#ifdef HAVE_RTREE_KEYS
|
|
case HA_KEY_ALG_RTREE:
|
|
error=rtree_get_first(info,inx,info->lastkey_length);
|
|
break;
|
|
#endif
|
|
case HA_KEY_ALG_BTREE:
|
|
default:
|
|
error=_mi_search_first(info,info->s->keyinfo+inx,
|
|
info->s->state.key_root[inx]);
|
|
break;
|
|
}
|
|
/*
|
|
"search first" failed. This means we have no pivot for
|
|
"search next", or in other words MI_INFO::lastkey is
|
|
likely uninitialized.
|
|
|
|
Normally SQL layer would never request "search next" if
|
|
"search first" failed. But HANDLER may do anything.
|
|
|
|
As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
|
|
equals to mi_rfirst(), we must restore original state
|
|
as if failing mi_rfirst() was not called.
|
|
*/
|
|
if (error)
|
|
update_mask|= HA_STATE_PREV_FOUND;
|
|
}
|
|
else
|
|
{
|
|
switch (info->s->keyinfo[inx].key_alg) {
|
|
#ifdef HAVE_RTREE_KEYS
|
|
case HA_KEY_ALG_RTREE:
|
|
/*
|
|
Note that rtree doesn't support that the table
|
|
may be changed since last call, so we do need
|
|
to skip rows inserted by other threads like in btree
|
|
*/
|
|
error= rtree_get_next(info,inx,info->lastkey_length);
|
|
break;
|
|
#endif
|
|
case HA_KEY_ALG_BTREE:
|
|
default:
|
|
if (!changed)
|
|
error= _mi_search_next(info,info->s->keyinfo+inx,info->lastkey,
|
|
info->lastkey_length,flag,
|
|
info->s->state.key_root[inx]);
|
|
else
|
|
error= _mi_search(info,info->s->keyinfo+inx,info->lastkey,
|
|
USE_WHOLE_KEY,flag, info->s->state.key_root[inx]);
|
|
}
|
|
}
|
|
|
|
if (!error)
|
|
{
|
|
while ((info->s->concurrent_insert &&
|
|
info->lastpos >= info->state->data_file_length) ||
|
|
(info->index_cond_func &&
|
|
(icp_res= mi_check_index_cond(info, inx, buf)) == ICP_NO_MATCH))
|
|
{
|
|
/*
|
|
If we are at the last key on the key page, allow writers to
|
|
access the index.
|
|
*/
|
|
if (info->int_keypos >= info->int_maxpos &&
|
|
mi_yield_and_check_if_killed(info, inx))
|
|
{
|
|
error= 1;
|
|
break;
|
|
}
|
|
|
|
/*
|
|
Skip rows that are either inserted by other threads since
|
|
we got a lock or do not match pushed index conditions
|
|
*/
|
|
if ((error=_mi_search_next(info,info->s->keyinfo+inx,
|
|
info->lastkey,
|
|
info->lastkey_length,
|
|
SEARCH_BIGGER,
|
|
info->s->state.key_root[inx])))
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (info->s->concurrent_insert)
|
|
rw_unlock(&info->s->key_root_lock[inx]);
|
|
|
|
/* Don't clear if database-changed */
|
|
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
|
info->update|= update_mask;
|
|
|
|
if (error || icp_res != ICP_MATCH)
|
|
{
|
|
fast_mi_writeinfo(info);
|
|
if (my_errno == HA_ERR_KEY_NOT_FOUND)
|
|
my_errno=HA_ERR_END_OF_FILE;
|
|
}
|
|
else if (!buf)
|
|
{
|
|
fast_mi_writeinfo(info);
|
|
DBUG_RETURN(info->lastpos==HA_OFFSET_ERROR ? my_errno : 0);
|
|
}
|
|
else if (!(*info->read_record)(info,info->lastpos,buf))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
DBUG_RETURN(0);
|
|
}
|
|
DBUG_PRINT("error",("Got error: %d, errno: %d",error, my_errno));
|
|
DBUG_RETURN(my_errno);
|
|
} /* mi_rnext */
|