mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
76078f2c84
myisam/ftdefs.h: intermediate cleanup checkin myisam/mi_create.c: intermediate cleanup checkin myisam/myisamchk.c: intermediate cleanup checkin myisam/ft_parser.c: intermediate cleanup checkin myisam/ft_update.c: intermediate cleanup checkin myisam/mi_update.c: intermediate cleanup checkin mysql-test/r/fulltext.result: stopword test mysql-test/t/fulltext.test: stopword test mysys/mulalloc.c: function comments clarified include/my_handler.h: get_key_length_rdonly utility macro include/myisam.h: this kind of hacks bites :) myisam/ft_dump.c: bugfix myisam/mi_open.c: bugfix myisam/sort.c: bugfixing myisam/mi_rnext.c: not a solution at all, but a temporary fix to make mi_rnext to work on ft2 index. (only ft_dump uses mi_rnext on fulltext indexes for now). myisam/ft_boolean_search.c: ft_sintXkorr, ft_intXstore myisam/ft_nlq_search.c: ft_sintXkorr, ft_intXstore myisam/fulltext.h: ft_sintXkorr, ft_intXstore myisam/mi_check.c: ft_sintXkorr, ft_intXstore myisam/ft_static.c: two-level tree support in wi_write() myisam/mi_write.c: two-level tree support in wi_write() myisam/myisamdef.h: two-level tree support in wi_write() myisam/mi_delete.c: support for ft2 in mi_delete mysql-test/r/fulltext2.result: support for ft2 in mi_delete mysql-test/t/fulltext2.test: support for ft2 in mi_delete
121 lines
3.7 KiB
C
121 lines
3.7 KiB
C
/* Copyright (C) 2000 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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, byte *buf, int inx)
|
|
{
|
|
int error,changed;
|
|
uint flag;
|
|
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){
|
|
case HA_KEY_ALG_RTREE:
|
|
error=rtree_get_first(info,inx,info->lastkey_length);
|
|
break;
|
|
case HA_KEY_ALG_BTREE:
|
|
default:
|
|
error=_mi_search_first(info,info->s->keyinfo+inx,
|
|
info->s->state.key_root[inx]);
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
switch(info->s->keyinfo[inx].key_alg)
|
|
{
|
|
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;
|
|
|
|
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 && info->s->concurrent_insert)
|
|
{
|
|
while (info->lastpos >= info->state->data_file_length)
|
|
{
|
|
/* Skip rows that are inserted by other threads since we got a lock */
|
|
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|= HA_STATE_NEXT_FOUND;
|
|
|
|
if (error)
|
|
{
|
|
if (my_errno == HA_ERR_KEY_NOT_FOUND)
|
|
my_errno=HA_ERR_END_OF_FILE;
|
|
}
|
|
else if (!buf)
|
|
{
|
|
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 */
|