mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
505c663a1e
- Added test case for Aria - Tested HANDLER with HEAP (changes to HEAP code will be pushed in 5.3) - Moved all HANDLER test to suite/handler. mysql-test/Makefile.am: Added suite/handler mysql-test/mysql-test-run.pl: Added suite/handler mysql-test/r/lock_multi.result: Remove test that is already in handler test suite mysql-test/suite/handler/aria.result: Test for HANDLER with Aria storage engine mysql-test/suite/handler/aria.test: Test for HANDLER with Aria storage engine mysql-test/suite/handler/handler.inc: Extended the general handler test Moved interface testing to 'interface.test' mysql-test/suite/handler/init.inc: Common init for handler tests. mysql-test/suite/handler/innodb.result: New results mysql-test/suite/handler/innodb.test: Update to use new include files mysql-test/suite/handler/interface.result: Test of HANDLER interface (not storage engine dependent parts) mysql-test/suite/handler/interface.test: Test of HANDLER interface (not storage engine dependent parts) mysql-test/suite/handler/myisam.result: New results mysql-test/suite/handler/myisam.test: Update to use new include files mysql-test/t/lock_multi.test: Remove test that is already in handler test suite mysys/tree.c: Added missing handling of read previous (showed up in HEAP testing) sql/handler.cc: Don't marka 'HA_ERR_RECORD_CHANGED' as fatal (can be used with HANDLER READ, especially with MEMORY ENGINE) sql/handler.h: Added prototype for can_continue_handler_scan() sql/sql_handler.cc: Re-initialize search if we switch from key to table search. Check if handler can continue searching between calls (via can_continue_handler_scan()) Don't write common not fatal errors to log storage/maria/ma_extra.c: Don't set index 0 as default. This forces call to ma_check_index() to set up index variables. storage/maria/ma_ft_boolean_search.c: Ensure that info->last_key.keyinfo is set storage/maria/ma_open.c: Don't set index 0 as default. This forces call to ma_check_index() to set up index variables. storage/maria/ma_rkey.c: Trivial optimization storage/maria/ma_rnext.c: Added missing code from mi_rnext.c to ensure that handler next/prev works. storage/maria/ma_rsame.c: Simple optimizations storage/maria/ma_search.c: Initialize info->last_key once and for all when we change keys. storage/maria/ma_unique.c: Ensure that info->last_key.keyinfo is up to date.
140 lines
4.3 KiB
C
140 lines
4.3 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
|
|
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(MARIA_HA *info, uchar *buf, int inx)
|
|
{
|
|
int error,changed;
|
|
uint flag;
|
|
MARIA_SHARE *share= info->s;
|
|
MARIA_KEYDEF *keyinfo;
|
|
uint update_mask= HA_STATE_NEXT_FOUND;
|
|
DBUG_ENTER("maria_rnext");
|
|
|
|
if ((inx = _ma_check_index(info,inx)) < 0)
|
|
DBUG_RETURN(my_errno);
|
|
flag=SEARCH_BIGGER; /* Read next */
|
|
if (info->cur_row.lastpos == HA_OFFSET_ERROR &&
|
|
info->update & HA_STATE_PREV_FOUND)
|
|
flag=0; /* Read first */
|
|
|
|
if (fast_ma_readinfo(info))
|
|
DBUG_RETURN(my_errno);
|
|
keyinfo= share->keyinfo + inx;
|
|
if (share->lock_key_trees)
|
|
rw_rdlock(&keyinfo->root_lock);
|
|
changed= _ma_test_if_changed(info);
|
|
if (!flag)
|
|
{
|
|
switch (keyinfo->key_alg){
|
|
#ifdef HAVE_RTREE_KEYS
|
|
case HA_KEY_ALG_RTREE:
|
|
error=maria_rtree_get_first(info, inx,
|
|
info->last_key.data_length +
|
|
info->last_key.ref_length);
|
|
|
|
break;
|
|
#endif
|
|
case HA_KEY_ALG_BTREE:
|
|
default:
|
|
error= _ma_search_first(info, keyinfo, share->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 (keyinfo->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= maria_rtree_get_next(info, inx, info->last_key.data_length +
|
|
info->last_key.ref_length);
|
|
break;
|
|
#endif
|
|
case HA_KEY_ALG_BTREE:
|
|
default:
|
|
if (!changed)
|
|
error= _ma_search_next(info, &info->last_key,
|
|
flag | info->last_key.flag,
|
|
share->state.key_root[inx]);
|
|
else
|
|
error= _ma_search(info, &info->last_key, flag | info->last_key.flag,
|
|
share->state.key_root[inx]);
|
|
}
|
|
}
|
|
|
|
if (!error)
|
|
{
|
|
while (!(*share->row_is_visible)(info))
|
|
{
|
|
/* Skip rows inserted by other threads since we got a lock */
|
|
if ((error= _ma_search_next(info, &info->last_key,
|
|
SEARCH_BIGGER,
|
|
share->state.key_root[inx])))
|
|
break;
|
|
}
|
|
}
|
|
if (share->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|= update_mask;
|
|
|
|
if (error)
|
|
{
|
|
if (my_errno == HA_ERR_KEY_NOT_FOUND)
|
|
my_errno=HA_ERR_END_OF_FILE;
|
|
}
|
|
else if (!buf)
|
|
{
|
|
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_PRINT("error",("Got error: %d, errno: %d",error, my_errno));
|
|
DBUG_RETURN(my_errno);
|
|
} /* maria_rnext */
|