mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
548a39a104
incorrect key file for table
In certain cases it could happen that deleting a row could
corrupt an RTREE index.
According to Guttman's algorithm, page underflow is handled
by storing the page in a list for later re-insertion. The
keys from the stored pages have to be inserted into the
remaining pages of the same level of the tree. Hence the
level number is stored in the re-insertion list together
with the page.
In the MySQL RTree implementation the level counts from zero
at the root page, increasing numbers for levels down the tree.
If during re-insertion of the keys the tree height grows, all
level numbers become invalid. The remaining keys will be
inserted at the wrong level.
The fix is to increment the level numbers stored in the
reinsert list after a split of the root block during reinsertion.
myisam/rt_index.c:
Bug#25673 - spatial index corruption, error 126
incorrect key file for table
Added a loop in rtree_delete() to increment the level numbers
stored in the reinsert list after a split of the root block
during reinsertion.
Added comments and DBUG statements.
myisam/rt_key.c:
Bug#25673 - spatial index corruption, error 126
incorrect key file for table
Added DBUG statements.
myisam/rt_split.c:
Bug#25673 - spatial index corruption, error 126
incorrect key file for table
Added DBUG statements.
mysql-test/r/gis-rtree.result:
Bug#25673 - spatial index corruption, error 126
incorrect key file for table
Added the test result.
mysql-test/t/gis-rtree.test:
Bug#25673 - spatial index corruption, error 126
incorrect key file for table
Added a test.
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin
|
|
|
|
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"
|
|
|
|
#ifdef HAVE_RTREE_KEYS
|
|
#include "rt_index.h"
|
|
#include "rt_key.h"
|
|
#include "rt_mbr.h"
|
|
|
|
/*
|
|
Add key to the page
|
|
|
|
RESULT VALUES
|
|
-1 Error
|
|
0 Not split
|
|
1 Split
|
|
*/
|
|
|
|
int rtree_add_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|
uint key_length, uchar *page_buf, my_off_t *new_page)
|
|
{
|
|
uint page_size = mi_getint(page_buf);
|
|
uint nod_flag = mi_test_if_nod(page_buf);
|
|
DBUG_ENTER("rtree_add_key");
|
|
|
|
if (page_size + key_length + info->s->base.rec_reflength <=
|
|
keyinfo->block_length)
|
|
{
|
|
/* split won't be necessary */
|
|
if (nod_flag)
|
|
{
|
|
/* save key */
|
|
DBUG_ASSERT(_mi_kpos(nod_flag, key) < info->state->key_file_length);
|
|
memcpy(rt_PAGE_END(page_buf), key - nod_flag, key_length + nod_flag);
|
|
page_size += key_length + nod_flag;
|
|
}
|
|
else
|
|
{
|
|
/* save key */
|
|
DBUG_ASSERT(_mi_dpos(info, nod_flag, key + key_length +
|
|
info->s->base.rec_reflength) <
|
|
info->state->data_file_length + info->s->base.pack_reclength);
|
|
memcpy(rt_PAGE_END(page_buf), key, key_length +
|
|
info->s->base.rec_reflength);
|
|
page_size += key_length + info->s->base.rec_reflength;
|
|
}
|
|
mi_putint(page_buf, page_size, nod_flag);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
DBUG_RETURN((rtree_split_page(info, keyinfo, page_buf, key, key_length,
|
|
new_page) ? -1 : 1));
|
|
}
|
|
|
|
/*
|
|
Delete key from the page
|
|
*/
|
|
int rtree_delete_key(MI_INFO *info, uchar *page_buf, uchar *key,
|
|
uint key_length, uint nod_flag)
|
|
{
|
|
uint16 page_size = mi_getint(page_buf);
|
|
uchar *key_start;
|
|
|
|
key_start= key - nod_flag;
|
|
if (!nod_flag)
|
|
key_length += info->s->base.rec_reflength;
|
|
|
|
memmove(key_start, key + key_length, page_size - key_length -
|
|
(key - page_buf));
|
|
page_size-= key_length + nod_flag;
|
|
|
|
mi_putint(page_buf, page_size, nod_flag);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Calculate and store key MBR
|
|
*/
|
|
|
|
int rtree_set_key_mbr(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|
uint key_length, my_off_t child_page)
|
|
{
|
|
DBUG_ENTER("rtree_set_key_mbr");
|
|
|
|
if (!_mi_fetch_keypage(info, keyinfo, child_page,
|
|
DFLT_INIT_HITS, info->buff, 0))
|
|
DBUG_RETURN(-1); /* purecov: inspected */
|
|
|
|
DBUG_RETURN(rtree_page_mbr(info, keyinfo->seg, info->buff, key, key_length));
|
|
}
|
|
|
|
#endif /*HAVE_RTREE_KEYS*/
|