mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
0d01dd200f
Added key and file version numbers to MEMORY tables so that we can detect if someone has changed them between HANDLER calls. mysql-test/suite/handler/aria.result: Fixed result after test changes mysql-test/suite/handler/handler.inc: Changed test to use combined key to ensure rows are returned in a pre-determinated order. mysql-test/suite/handler/heap.result: New result mysql-test/suite/handler/heap.test: Added test for HANDLER + HEAP mysql-test/suite/handler/innodb.result: Fixed result after test changes mysql-test/suite/handler/myisam.result: Fixed result after test changes sql/sql_handler.cc: Fixed wrong parameter to ha_index_next_same() storage/heap/ha_heap.cc: Abort key scan if table has changed. Abort table scan if table has been recreated. storage/heap/ha_heap.h: Added support for HANDLER storage/heap/hp_clear.c: Increase version number so that we can notice changes if using HANDLER storage/heap/hp_delete.c: Increase key data version number on key changes. storage/heap/hp_rfirst.c: Remember version of key data Give error if using read-first on hash key. storage/heap/hp_rkey.c: Remember version of key data storage/heap/hp_rlast.c: Remember version of key data Give error if using read-last on hash key. storage/heap/hp_rnext.c: Fixed that we get next key from last search. storage/heap/hp_rprev.c: Fixed that we get previous key from last search. storage/heap/hp_scan.c: Remember version of key and file data storage/heap/hp_update.c: Increase key data version number on key changes. storage/heap/hp_write.c: Increase key data version number on key changes.
90 lines
2.8 KiB
C
90 lines
2.8 KiB
C
/* Copyright (C) 2000-2002, 2004-2005 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 */
|
|
|
|
/* Update current record in heap-database */
|
|
|
|
#include "heapdef.h"
|
|
|
|
int heap_update(HP_INFO *info, const uchar *old, const uchar *heap_new)
|
|
{
|
|
HP_KEYDEF *keydef, *end, *p_lastinx;
|
|
uchar *pos;
|
|
my_bool auto_key_changed= 0, key_changed= 0;
|
|
HP_SHARE *share= info->s;
|
|
DBUG_ENTER("heap_update");
|
|
|
|
test_active(info);
|
|
pos=info->current_ptr;
|
|
|
|
if (info->opt_flag & READ_CHECK_USED && hp_rectest(info,old))
|
|
DBUG_RETURN(my_errno); /* Record changed */
|
|
if (--(share->records) < share->blength >> 1) share->blength>>= 1;
|
|
share->changed=1;
|
|
|
|
p_lastinx= share->keydef + info->lastinx;
|
|
for (keydef= share->keydef, end= keydef + share->keys; keydef < end; keydef++)
|
|
{
|
|
if (hp_rec_key_cmp(keydef, old, heap_new, 0))
|
|
{
|
|
if ((*keydef->delete_key)(info, keydef, old, pos, keydef == p_lastinx) ||
|
|
(*keydef->write_key)(info, keydef, heap_new, pos))
|
|
goto err;
|
|
if (share->auto_key == (uint) (keydef - share->keydef + 1))
|
|
auto_key_changed= 1;
|
|
}
|
|
}
|
|
|
|
memcpy(pos,heap_new,(size_t) share->reclength);
|
|
if (++(share->records) == share->blength) share->blength+= share->blength;
|
|
|
|
#if !defined(DBUG_OFF) && defined(EXTRA_HEAP_DEBUG)
|
|
DBUG_EXECUTE("check_heap",heap_check_heap(info, 0););
|
|
#endif
|
|
if (auto_key_changed)
|
|
heap_update_auto_increment(info, heap_new);
|
|
if (key_changed)
|
|
share->key_version++;
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
if (my_errno == HA_ERR_FOUND_DUPP_KEY)
|
|
{
|
|
info->errkey = (int) (keydef - share->keydef);
|
|
if (keydef->algorithm == HA_KEY_ALG_BTREE)
|
|
{
|
|
/* we don't need to delete non-inserted key from rb-tree */
|
|
if ((*keydef->write_key)(info, keydef, old, pos))
|
|
{
|
|
if (++(share->records) == share->blength)
|
|
share->blength+= share->blength;
|
|
DBUG_RETURN(my_errno);
|
|
}
|
|
keydef--;
|
|
}
|
|
while (keydef >= share->keydef)
|
|
{
|
|
if (hp_rec_key_cmp(keydef, old, heap_new, 0))
|
|
{
|
|
if ((*keydef->delete_key)(info, keydef, heap_new, pos, 0) ||
|
|
(*keydef->write_key)(info, keydef, old, pos))
|
|
break;
|
|
}
|
|
keydef--;
|
|
}
|
|
}
|
|
if (++(share->records) == share->blength)
|
|
share->blength+= share->blength;
|
|
DBUG_RETURN(my_errno);
|
|
} /* heap_update */
|