2006-04-11 15:45:10 +02:00
|
|
|
/* Copyright (C) 2006 MySQL AB & Ramil Kalimullin & 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
|
2007-03-02 11:20:23 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
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"
|
|
|
|
|
|
|
|
#ifdef HAVE_RTREE_KEYS
|
|
|
|
|
|
|
|
#include "ma_rt_index.h"
|
|
|
|
#include "ma_rt_key.h"
|
|
|
|
#include "ma_rt_mbr.h"
|
|
|
|
|
|
|
|
#define REINSERT_BUFFER_INC 10
|
|
|
|
#define PICK_BY_AREA
|
|
|
|
/*#define PICK_BY_PERIMETER*/
|
|
|
|
|
|
|
|
typedef struct st_page_level
|
|
|
|
{
|
|
|
|
uint level;
|
|
|
|
my_off_t offs;
|
|
|
|
} stPageLevel;
|
|
|
|
|
|
|
|
typedef struct st_page_list
|
|
|
|
{
|
|
|
|
ulong n_pages;
|
|
|
|
ulong m_pages;
|
|
|
|
stPageLevel *pages;
|
|
|
|
} stPageList;
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Find next key in r-tree according to search_flag recursively
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
Used in maria_rtree_find_first() and maria_rtree_find_next()
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Found
|
|
|
|
1 Not found
|
|
|
|
*/
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static int maria_rtree_find_req(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
|
|
|
|
uint search_flag,
|
|
|
|
uint nod_cmp_flag, my_off_t page, int level)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint nod_flag;
|
|
|
|
int res;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *page_buf, *k, *last;
|
2006-04-11 15:45:10 +02:00
|
|
|
int k_len;
|
|
|
|
uint *saved_key = (uint*) (info->maria_rtree_recursion_state) + level;
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
if (!(page_buf = (uchar*) my_alloca((uint)keyinfo->block_length)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!_ma_fetch_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf, 0))
|
|
|
|
goto err1;
|
|
|
|
nod_flag = _ma_test_if_nod(page_buf);
|
|
|
|
|
|
|
|
k_len = keyinfo->keylength - info->s->base.rec_reflength;
|
|
|
|
|
|
|
|
if(info->maria_rtree_recursion_depth >= level)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
k= page_buf + *saved_key;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
last= rt_PAGE_END(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag))
|
|
|
|
{
|
|
|
|
if (nod_flag)
|
|
|
|
{
|
|
|
|
/* this is an internal node in the tree */
|
2007-01-18 20:38:14 +01:00
|
|
|
if (!(res = maria_rtree_key_cmp(keyinfo->seg,
|
|
|
|
info->first_mbr_key, k,
|
|
|
|
info->last_rkey_length, nod_cmp_flag)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
switch ((res = maria_rtree_find_req(info, keyinfo, search_flag,
|
|
|
|
nod_cmp_flag,
|
|
|
|
_ma_kpos(nod_flag, k),
|
|
|
|
level + 1)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
case 0: /* found - exit from recursion */
|
|
|
|
*saved_key = k - page_buf;
|
|
|
|
goto ok;
|
|
|
|
case 1: /* not found - continue searching */
|
|
|
|
info->maria_rtree_recursion_depth = level;
|
|
|
|
break;
|
|
|
|
default: /* error */
|
|
|
|
case -1:
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* this is a leaf */
|
2007-01-18 20:38:14 +01:00
|
|
|
if (!maria_rtree_key_cmp(keyinfo->seg, info->first_mbr_key,
|
|
|
|
k, info->last_rkey_length, search_flag))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *after_key = (uchar*) rt_PAGE_NEXT_KEY(k, k_len, nod_flag);
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos = _ma_dpos(info, 0, after_key);
|
2006-04-11 15:45:10 +02:00
|
|
|
info->lastkey_length = k_len + info->s->base.rec_reflength;
|
|
|
|
memcpy(info->lastkey, k, info->lastkey_length);
|
|
|
|
info->maria_rtree_recursion_depth = level;
|
|
|
|
*saved_key = last - page_buf;
|
|
|
|
|
|
|
|
if (after_key < last)
|
|
|
|
{
|
|
|
|
info->int_keypos = info->buff;
|
|
|
|
info->int_maxpos = info->buff + (last - after_key);
|
|
|
|
memcpy(info->buff, after_key, last - after_key);
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used = 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used = 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
res = 0;
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos = HA_OFFSET_ERROR;
|
2006-04-11 15:45:10 +02:00
|
|
|
my_errno = HA_ERR_KEY_NOT_FOUND;
|
|
|
|
res = 1;
|
|
|
|
|
|
|
|
ok:
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return res;
|
|
|
|
|
|
|
|
err1:
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)page_buf);
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos = HA_OFFSET_ERROR;
|
2006-04-11 15:45:10 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Find first key in r-tree according to search_flag condition
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
maria_rtree_find_first()
|
|
|
|
info Handler to MARIA file
|
|
|
|
uint keynr Key number to use
|
|
|
|
key Key to search for
|
|
|
|
key_length Length of 'key'
|
|
|
|
search_flag Bitmap of flags how to do the search
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Found
|
|
|
|
1 Not found
|
|
|
|
*/
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
int maria_rtree_find_first(MARIA_HA *info, uint keynr, uchar *key,
|
2007-01-18 20:38:14 +01:00
|
|
|
uint key_length, uint search_flag)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
my_off_t root;
|
|
|
|
uint nod_cmp_flag;
|
|
|
|
MARIA_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
|
|
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
/*
|
|
|
|
Save searched key, include data pointer.
|
|
|
|
The data pointer is required if the search_flag contains MBR_DATA.
|
|
|
|
*/
|
|
|
|
memcpy(info->first_mbr_key, key, keyinfo->keylength);
|
2006-04-11 15:45:10 +02:00
|
|
|
info->last_rkey_length = key_length;
|
|
|
|
|
|
|
|
info->maria_rtree_recursion_depth = -1;
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used = 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
nod_cmp_flag= ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
|
|
|
|
MBR_WITHIN : MBR_INTERSECT);
|
|
|
|
return maria_rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag, root,
|
|
|
|
0);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Find next key in r-tree according to search_flag condition
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
maria_rtree_find_next()
|
|
|
|
info Handler to MARIA file
|
|
|
|
uint keynr Key number to use
|
|
|
|
search_flag Bitmap of flags how to do the search
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Found
|
|
|
|
1 Not found
|
|
|
|
*/
|
|
|
|
|
|
|
|
int maria_rtree_find_next(MARIA_HA *info, uint keynr, uint search_flag)
|
|
|
|
{
|
|
|
|
my_off_t root;
|
|
|
|
uint nod_cmp_flag;
|
|
|
|
MARIA_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
|
|
|
|
if (info->update & HA_STATE_DELETED)
|
2007-01-18 20:38:14 +01:00
|
|
|
return maria_rtree_find_first(info, keynr, info->lastkey,
|
|
|
|
info->lastkey_length,
|
|
|
|
search_flag);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-04-19 12:18:56 +02:00
|
|
|
if (!info->keyread_buff_used)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *key= info->int_keypos;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
while (key < info->int_maxpos)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if (!maria_rtree_key_cmp(keyinfo->seg,
|
|
|
|
info->first_mbr_key, key,
|
|
|
|
info->last_rkey_length, search_flag))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *after_key= key + keyinfo->keylength;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos= _ma_dpos(info, 0, after_key);
|
2006-04-11 15:45:10 +02:00
|
|
|
memcpy(info->lastkey, key, info->lastkey_length);
|
|
|
|
|
|
|
|
if (after_key < info->int_maxpos)
|
|
|
|
info->int_keypos= after_key;
|
|
|
|
else
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used= 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
key+= keyinfo->keylength;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
nod_cmp_flag = ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
|
|
|
|
MBR_WITHIN : MBR_INTERSECT);
|
|
|
|
return maria_rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag, root, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Get next key in r-tree recursively
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
Used in maria_rtree_get_first() and maria_rtree_get_next()
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Found
|
|
|
|
1 Not found
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int maria_rtree_get_req(MARIA_HA *info, MARIA_KEYDEF *keyinfo, uint key_length,
|
|
|
|
my_off_t page, int level)
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *page_buf, *last, *k;
|
2007-01-18 20:38:14 +01:00
|
|
|
uint nod_flag, k_len;
|
2006-04-11 15:45:10 +02:00
|
|
|
int res;
|
2007-01-18 20:38:14 +01:00
|
|
|
uint *saved_key= (uint*) (info->maria_rtree_recursion_state) + level;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
if (!(page_buf= (uchar*) my_alloca((uint)keyinfo->block_length)))
|
2006-04-11 15:45:10 +02:00
|
|
|
return -1;
|
|
|
|
if (!_ma_fetch_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf, 0))
|
|
|
|
goto err1;
|
|
|
|
nod_flag = _ma_test_if_nod(page_buf);
|
|
|
|
|
|
|
|
k_len = keyinfo->keylength - info->s->base.rec_reflength;
|
|
|
|
|
|
|
|
if(info->maria_rtree_recursion_depth >= level)
|
|
|
|
{
|
|
|
|
k = page_buf + *saved_key;
|
|
|
|
if (!nod_flag)
|
|
|
|
{
|
|
|
|
/* Only leaf pages contain data references. */
|
|
|
|
/* Need to check next key with data reference. */
|
|
|
|
k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
|
|
}
|
|
|
|
last = rt_PAGE_END(page_buf);
|
|
|
|
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag))
|
|
|
|
{
|
|
|
|
if (nod_flag)
|
|
|
|
{
|
|
|
|
/* this is an internal node in the tree */
|
|
|
|
switch ((res = maria_rtree_get_req(info, keyinfo, key_length,
|
2007-01-18 20:38:14 +01:00
|
|
|
_ma_kpos(nod_flag, k), level + 1)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
case 0: /* found - exit from recursion */
|
|
|
|
*saved_key = k - page_buf;
|
|
|
|
goto ok;
|
|
|
|
case 1: /* not found - continue searching */
|
|
|
|
info->maria_rtree_recursion_depth = level;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
case -1: /* error */
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* this is a leaf */
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *after_key = rt_PAGE_NEXT_KEY(k, k_len, nod_flag);
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos = _ma_dpos(info, 0, after_key);
|
2006-04-11 15:45:10 +02:00
|
|
|
info->lastkey_length = k_len + info->s->base.rec_reflength;
|
|
|
|
memcpy(info->lastkey, k, info->lastkey_length);
|
|
|
|
|
|
|
|
info->maria_rtree_recursion_depth = level;
|
|
|
|
*saved_key = k - page_buf;
|
|
|
|
|
|
|
|
if (after_key < last)
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
info->int_keypos = (uchar*) saved_key;
|
2006-04-11 15:45:10 +02:00
|
|
|
memcpy(info->buff, page_buf, keyinfo->block_length);
|
|
|
|
info->int_maxpos = rt_PAGE_END(info->buff);
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used = 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used = 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
res = 0;
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos = HA_OFFSET_ERROR;
|
2006-04-11 15:45:10 +02:00
|
|
|
my_errno = HA_ERR_KEY_NOT_FOUND;
|
|
|
|
res = 1;
|
|
|
|
|
|
|
|
ok:
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return res;
|
|
|
|
|
|
|
|
err1:
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)page_buf);
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos = HA_OFFSET_ERROR;
|
2006-04-11 15:45:10 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Get first key in r-tree
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Found
|
|
|
|
1 Not found
|
|
|
|
*/
|
|
|
|
|
|
|
|
int maria_rtree_get_first(MARIA_HA *info, uint keynr, uint key_length)
|
|
|
|
{
|
|
|
|
my_off_t root;
|
|
|
|
MARIA_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
|
|
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
info->maria_rtree_recursion_depth = -1;
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used = 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
return maria_rtree_get_req(info, &keyinfo[keynr], key_length, root, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Get next key in r-tree
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Found
|
|
|
|
1 Not found
|
|
|
|
*/
|
|
|
|
|
|
|
|
int maria_rtree_get_next(MARIA_HA *info, uint keynr, uint key_length)
|
|
|
|
{
|
|
|
|
my_off_t root;
|
|
|
|
MARIA_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
|
2007-04-19 12:18:56 +02:00
|
|
|
if (!info->keyread_buff_used)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint k_len = keyinfo->keylength - info->s->base.rec_reflength;
|
|
|
|
/* rt_PAGE_NEXT_KEY(info->int_keypos) */
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *key = info->buff + *(int*)info->int_keypos + k_len +
|
2006-04-11 15:45:10 +02:00
|
|
|
info->s->base.rec_reflength;
|
|
|
|
/* rt_PAGE_NEXT_KEY(key) */
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *after_key = key + k_len + info->s->base.rec_reflength;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos = _ma_dpos(info, 0, after_key);
|
2006-04-11 15:45:10 +02:00
|
|
|
info->lastkey_length = k_len + info->s->base.rec_reflength;
|
|
|
|
memcpy(info->lastkey, key, k_len + info->s->base.rec_reflength);
|
|
|
|
|
|
|
|
*(int*)info->int_keypos = key - info->buff;
|
|
|
|
if (after_key >= info->int_maxpos)
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used = 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return maria_rtree_get_req(info, &keyinfo[keynr], key_length, root, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Choose non-leaf better key for insertion
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef PICK_BY_PERIMETER
|
2007-01-18 20:38:14 +01:00
|
|
|
static uchar *maria_rtree_pick_key(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
|
|
|
|
uchar *key,
|
2007-07-02 19:45:15 +02:00
|
|
|
uint key_length, uchar *page_buf,
|
2007-01-18 20:38:14 +01:00
|
|
|
uint nod_flag)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
double increase;
|
|
|
|
double best_incr = DBL_MAX;
|
|
|
|
double perimeter;
|
|
|
|
double best_perimeter;
|
|
|
|
uchar *best_key;
|
|
|
|
uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
|
|
uchar *last = rt_PAGE_END(page_buf);
|
|
|
|
|
|
|
|
LINT_INIT(best_perimeter);
|
|
|
|
LINT_INIT(best_key);
|
|
|
|
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
|
|
|
|
{
|
|
|
|
if ((increase = maria_rtree_perimeter_increase(keyinfo->seg, k, key, key_length,
|
|
|
|
&perimeter)) == -1)
|
|
|
|
return NULL;
|
|
|
|
if ((increase < best_incr)||
|
|
|
|
(increase == best_incr && perimeter < best_perimeter))
|
|
|
|
{
|
|
|
|
best_key = k;
|
|
|
|
best_perimeter= perimeter;
|
|
|
|
best_incr = increase;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return best_key;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /*PICK_BY_PERIMETER*/
|
|
|
|
|
|
|
|
#ifdef PICK_BY_AREA
|
2007-07-02 19:45:15 +02:00
|
|
|
static uchar *maria_rtree_pick_key(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
|
|
|
|
uchar *key,
|
|
|
|
uint key_length, uchar *page_buf,
|
2007-01-18 20:38:14 +01:00
|
|
|
uint nod_flag)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
double increase;
|
|
|
|
double best_incr = DBL_MAX;
|
|
|
|
double area;
|
|
|
|
double best_area;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *best_key;
|
|
|
|
uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
|
|
uchar *last = rt_PAGE_END(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
LINT_INIT(best_area);
|
|
|
|
LINT_INIT(best_key);
|
|
|
|
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
|
|
|
|
{
|
|
|
|
/* The following is safe as -1.0 is an exact number */
|
|
|
|
if ((increase = maria_rtree_area_increase(keyinfo->seg, k, key, key_length,
|
2007-01-18 20:38:14 +01:00
|
|
|
&area)) == -1.0)
|
2006-04-11 15:45:10 +02:00
|
|
|
return NULL;
|
|
|
|
/* The following should be safe, even if we compare doubles */
|
|
|
|
if (increase < best_incr)
|
|
|
|
{
|
|
|
|
best_key = k;
|
|
|
|
best_area = area;
|
|
|
|
best_incr = increase;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* The following should be safe, even if we compare doubles */
|
|
|
|
if ((increase == best_incr) && (area < best_area))
|
|
|
|
{
|
|
|
|
best_key = k;
|
|
|
|
best_area = area;
|
|
|
|
best_incr = increase;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return best_key;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /*PICK_BY_AREA*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
Go down and insert key into tree
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Child was not split
|
|
|
|
1 Child was split
|
|
|
|
*/
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static int maria_rtree_insert_req(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *key,
|
2007-01-18 20:38:14 +01:00
|
|
|
uint key_length, my_off_t page,
|
|
|
|
my_off_t *new_page,
|
|
|
|
int ins_level, int level)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint nod_flag;
|
|
|
|
int res;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *page_buf, *k;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
if (!(page_buf= (uchar*) my_alloca((uint)keyinfo->block_length +
|
2006-04-11 15:45:10 +02:00
|
|
|
HA_MAX_KEY_BUFF)))
|
|
|
|
{
|
|
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!_ma_fetch_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf, 0))
|
|
|
|
goto err1;
|
|
|
|
nod_flag = _ma_test_if_nod(page_buf);
|
|
|
|
|
|
|
|
if ((ins_level == -1 && nod_flag) || /* key: go down to leaf */
|
|
|
|
(ins_level > -1 && ins_level > level)) /* branch: go down to ins_level */
|
|
|
|
{
|
|
|
|
if ((k = maria_rtree_pick_key(info, keyinfo, key, key_length, page_buf,
|
2007-01-18 20:38:14 +01:00
|
|
|
nod_flag)) == NULL)
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err1;
|
|
|
|
switch ((res = maria_rtree_insert_req(info, keyinfo, key, key_length,
|
2007-01-18 20:38:14 +01:00
|
|
|
_ma_kpos(nod_flag, k), new_page,
|
|
|
|
ins_level, level + 1)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
case 0: /* child was not split */
|
|
|
|
{
|
|
|
|
maria_rtree_combine_rect(keyinfo->seg, k, key, k, key_length);
|
|
|
|
if (_ma_write_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf))
|
|
|
|
goto err1;
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
case 1: /* child was split */
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *new_key = page_buf + keyinfo->block_length + nod_flag;
|
2006-04-11 15:45:10 +02:00
|
|
|
/* set proper MBR for key */
|
|
|
|
if (maria_rtree_set_key_mbr(info, keyinfo, k, key_length,
|
2007-01-18 20:38:14 +01:00
|
|
|
_ma_kpos(nod_flag, k)))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err1;
|
|
|
|
/* add new key for new page */
|
|
|
|
_ma_kpointer(info, new_key - nod_flag, *new_page);
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_rtree_set_key_mbr(info, keyinfo, new_key, key_length,
|
|
|
|
*new_page))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err1;
|
|
|
|
res = maria_rtree_add_key(info, keyinfo, new_key, key_length,
|
|
|
|
page_buf, new_page);
|
|
|
|
if (_ma_write_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf))
|
|
|
|
goto err1;
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
case -1: /* error */
|
|
|
|
{
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
res = maria_rtree_add_key(info, keyinfo, key, key_length, page_buf,
|
|
|
|
new_page);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (_ma_write_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf))
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ok:
|
2007-01-18 20:38:14 +01:00
|
|
|
my_afree(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return res;
|
|
|
|
|
|
|
|
err1:
|
2007-01-18 20:38:14 +01:00
|
|
|
my_afree(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Insert key into the tree
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Root was not split
|
|
|
|
1 Root was split
|
|
|
|
*/
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
static int maria_rtree_insert_level(MARIA_HA *info, uint keynr, uchar *key,
|
2007-01-18 20:38:14 +01:00
|
|
|
uint key_length, int ins_level)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
my_off_t old_root;
|
|
|
|
MARIA_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
int res;
|
|
|
|
my_off_t new_page;
|
|
|
|
|
|
|
|
if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
if ((old_root = _ma_new(info, keyinfo, DFLT_INIT_HITS)) == HA_OFFSET_ERROR)
|
|
|
|
return -1;
|
2007-04-19 12:18:56 +02:00
|
|
|
info->keyread_buff_used = 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
maria_putint(info->buff, 2, 0);
|
|
|
|
res = maria_rtree_add_key(info, keyinfo, key, key_length, info->buff, NULL);
|
|
|
|
if (_ma_write_keypage(info, keyinfo, old_root, DFLT_INIT_HITS, info->buff))
|
|
|
|
return 1;
|
|
|
|
info->s->state.key_root[keynr] = old_root;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch ((res = maria_rtree_insert_req(info, keyinfo, key, key_length,
|
|
|
|
old_root, &new_page, ins_level, 0)))
|
|
|
|
{
|
|
|
|
case 0: /* root was not split */
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 1: /* root was split, grow a new root */
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *new_root_buf, *new_key;
|
2006-04-11 15:45:10 +02:00
|
|
|
my_off_t new_root;
|
|
|
|
uint nod_flag = info->s->base.key_reflength;
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
if (!(new_root_buf= (uchar*) my_alloca((uint)keyinfo->block_length +
|
2007-01-18 20:38:14 +01:00
|
|
|
HA_MAX_KEY_BUFF)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
maria_putint(new_root_buf, 2, nod_flag);
|
|
|
|
if ((new_root = _ma_new(info, keyinfo, DFLT_INIT_HITS)) ==
|
|
|
|
HA_OFFSET_ERROR)
|
|
|
|
goto err1;
|
|
|
|
|
|
|
|
new_key = new_root_buf + keyinfo->block_length + nod_flag;
|
|
|
|
|
|
|
|
_ma_kpointer(info, new_key - nod_flag, old_root);
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_rtree_set_key_mbr(info, keyinfo, new_key, key_length,
|
|
|
|
old_root))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err1;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_rtree_add_key(info, keyinfo, new_key, key_length, new_root_buf,
|
|
|
|
NULL)
|
2006-04-11 15:45:10 +02:00
|
|
|
== -1)
|
|
|
|
goto err1;
|
|
|
|
_ma_kpointer(info, new_key - nod_flag, new_page);
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_rtree_set_key_mbr(info, keyinfo, new_key, key_length,
|
|
|
|
new_page))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err1;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_rtree_add_key(info, keyinfo, new_key, key_length, new_root_buf,
|
|
|
|
NULL)
|
2006-04-11 15:45:10 +02:00
|
|
|
== -1)
|
|
|
|
goto err1;
|
|
|
|
if (_ma_write_keypage(info, keyinfo, new_root,
|
|
|
|
DFLT_INIT_HITS, new_root_buf))
|
|
|
|
goto err1;
|
|
|
|
info->s->state.key_root[keynr] = new_root;
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)new_root_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
err1:
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)new_root_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
case -1: /* error */
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Insert key into the tree - interface function
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 OK
|
|
|
|
*/
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
int maria_rtree_insert(MARIA_HA *info, uint keynr, uchar *key, uint key_length)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
return (!key_length ||
|
2007-01-18 20:38:14 +01:00
|
|
|
(maria_rtree_insert_level(info, keynr, key, key_length, -1) == -1)) ?
|
|
|
|
-1 : 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Fill reinsert page buffer
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 OK
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int maria_rtree_fill_reinsert_list(stPageList *ReinsertList, my_off_t page,
|
|
|
|
int level)
|
|
|
|
{
|
|
|
|
if (ReinsertList->n_pages == ReinsertList->m_pages)
|
|
|
|
{
|
|
|
|
ReinsertList->m_pages += REINSERT_BUFFER_INC;
|
2007-07-02 19:45:15 +02:00
|
|
|
if (!(ReinsertList->pages = (stPageLevel*)my_realloc((uchar*)ReinsertList->pages,
|
2006-04-11 15:45:10 +02:00
|
|
|
ReinsertList->m_pages * sizeof(stPageLevel), MYF(MY_ALLOW_ZERO_PTR))))
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
/* save page to ReinsertList */
|
|
|
|
ReinsertList->pages[ReinsertList->n_pages].offs = page;
|
|
|
|
ReinsertList->pages[ReinsertList->n_pages].level = level;
|
|
|
|
ReinsertList->n_pages++;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err1:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Go down and delete key from the tree
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Deleted
|
|
|
|
1 Not found
|
|
|
|
2 Empty leaf
|
|
|
|
*/
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static int maria_rtree_delete_req(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *key,
|
2007-01-18 20:38:14 +01:00
|
|
|
uint key_length, my_off_t page,
|
|
|
|
uint *page_size,
|
|
|
|
stPageList *ReinsertList, int level)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
ulong i;
|
|
|
|
uint nod_flag;
|
|
|
|
int res;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *page_buf, *last, *k;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
if (!(page_buf = (uchar*) my_alloca((uint)keyinfo->block_length)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!_ma_fetch_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf, 0))
|
|
|
|
goto err1;
|
|
|
|
nod_flag = _ma_test_if_nod(page_buf);
|
|
|
|
|
|
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
|
|
last = rt_PAGE_END(page_buf);
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
for (i = 0; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag), i++)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (nod_flag)
|
|
|
|
{
|
|
|
|
/* not leaf */
|
|
|
|
if (!maria_rtree_key_cmp(keyinfo->seg, key, k, key_length, MBR_WITHIN))
|
|
|
|
{
|
|
|
|
switch ((res = maria_rtree_delete_req(info, keyinfo, key, key_length,
|
|
|
|
_ma_kpos(nod_flag, k), page_size, ReinsertList, level + 1)))
|
|
|
|
{
|
|
|
|
case 0: /* deleted */
|
|
|
|
{
|
|
|
|
/* test page filling */
|
2007-01-18 20:38:14 +01:00
|
|
|
if (*page_size + key_length >=
|
|
|
|
rt_PAGE_MIN_SIZE(keyinfo->block_length))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
/* OK */
|
|
|
|
if (maria_rtree_set_key_mbr(info, keyinfo, k, key_length,
|
|
|
|
_ma_kpos(nod_flag, k)))
|
|
|
|
goto err1;
|
|
|
|
if (_ma_write_keypage(info, keyinfo, page,
|
|
|
|
DFLT_INIT_HITS, page_buf))
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* too small: delete key & add it descendant to reinsert list */
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_rtree_fill_reinsert_list(ReinsertList,
|
|
|
|
_ma_kpos(nod_flag, k),
|
2006-04-11 15:45:10 +02:00
|
|
|
level + 1))
|
|
|
|
goto err1;
|
|
|
|
maria_rtree_delete_key(info, page_buf, k, key_length, nod_flag);
|
|
|
|
if (_ma_write_keypage(info, keyinfo, page,
|
|
|
|
DFLT_INIT_HITS, page_buf))
|
|
|
|
goto err1;
|
2007-06-09 13:52:17 +02:00
|
|
|
*page_size = maria_data_on_page(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
case 1: /* not found - continue searching */
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 2: /* vacuous case: last key in the leaf */
|
|
|
|
{
|
|
|
|
maria_rtree_delete_key(info, page_buf, k, key_length, nod_flag);
|
|
|
|
if (_ma_write_keypage(info, keyinfo, page,
|
|
|
|
DFLT_INIT_HITS, page_buf))
|
|
|
|
goto err1;
|
2007-06-09 13:52:17 +02:00
|
|
|
*page_size = maria_data_on_page(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
res = 0;
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
default: /* error */
|
|
|
|
case -1:
|
|
|
|
{
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* leaf */
|
|
|
|
if (!maria_rtree_key_cmp(keyinfo->seg, key, k, key_length, MBR_EQUAL | MBR_DATA))
|
|
|
|
{
|
|
|
|
maria_rtree_delete_key(info, page_buf, k, key_length, nod_flag);
|
2007-06-09 13:52:17 +02:00
|
|
|
*page_size = maria_data_on_page(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (*page_size == 2)
|
|
|
|
{
|
|
|
|
/* last key in the leaf */
|
|
|
|
res = 2;
|
|
|
|
if (_ma_dispose(info, keyinfo, page, DFLT_INIT_HITS))
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
res = 0;
|
|
|
|
if (_ma_write_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf))
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
res = 1;
|
|
|
|
|
|
|
|
ok:
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return res;
|
|
|
|
|
|
|
|
err1:
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Delete key - interface function
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
-1 Error
|
|
|
|
0 Deleted
|
|
|
|
*/
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
int maria_rtree_delete(MARIA_HA *info, uint keynr, uchar *key, uint key_length)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint page_size;
|
|
|
|
stPageList ReinsertList;
|
|
|
|
my_off_t old_root;
|
|
|
|
MARIA_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
|
|
|
|
if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ReinsertList.pages = NULL;
|
|
|
|
ReinsertList.n_pages = 0;
|
|
|
|
ReinsertList.m_pages = 0;
|
|
|
|
|
|
|
|
switch (maria_rtree_delete_req(info, keyinfo, key, key_length, old_root,
|
|
|
|
&page_size, &ReinsertList, 0))
|
|
|
|
{
|
|
|
|
case 2:
|
|
|
|
{
|
|
|
|
info->s->state.key_root[keynr] = HA_OFFSET_ERROR;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
case 0:
|
|
|
|
{
|
|
|
|
uint nod_flag;
|
|
|
|
ulong i;
|
|
|
|
for (i = 0; i < ReinsertList.n_pages; ++i)
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *page_buf, *k, *last;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
if (!(page_buf = (uchar*) my_alloca((uint)keyinfo->block_length)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
if (!_ma_fetch_keypage(info, keyinfo, ReinsertList.pages[i].offs,
|
|
|
|
DFLT_INIT_HITS, page_buf, 0))
|
|
|
|
goto err1;
|
|
|
|
nod_flag = _ma_test_if_nod(page_buf);
|
|
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
|
|
last = rt_PAGE_END(page_buf);
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
|
|
|
|
{
|
|
|
|
if (maria_rtree_insert_level(info, keynr, k, key_length,
|
|
|
|
ReinsertList.pages[i].level) == -1)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
my_afree(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
my_afree(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (_ma_dispose(info, keyinfo, ReinsertList.pages[i].offs,
|
|
|
|
DFLT_INIT_HITS))
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
if (ReinsertList.pages)
|
2007-07-02 19:45:15 +02:00
|
|
|
my_free((uchar*) ReinsertList.pages, MYF(0));
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
/* check for redundant root (not leaf, 1 child) and eliminate */
|
|
|
|
if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
|
|
goto err1;
|
|
|
|
if (!_ma_fetch_keypage(info, keyinfo, old_root, DFLT_INIT_HITS,
|
|
|
|
info->buff, 0))
|
|
|
|
goto err1;
|
|
|
|
nod_flag = _ma_test_if_nod(info->buff);
|
2007-06-09 13:52:17 +02:00
|
|
|
page_size = maria_data_on_page(info->buff);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (nod_flag && (page_size == 2 + key_length + nod_flag))
|
|
|
|
{
|
|
|
|
my_off_t new_root = _ma_kpos(nod_flag,
|
|
|
|
rt_PAGE_FIRST_KEY(info->buff, nod_flag));
|
|
|
|
if (_ma_dispose(info, keyinfo, old_root, DFLT_INIT_HITS))
|
|
|
|
goto err1;
|
|
|
|
info->s->state.key_root[keynr] = new_root;
|
|
|
|
}
|
|
|
|
info->update= HA_STATE_DELETED;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err1:
|
|
|
|
return -1;
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
case 1: /* not found */
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
my_errno = HA_ERR_KEY_NOT_FOUND;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
default:
|
2007-01-18 20:38:14 +01:00
|
|
|
case -1: /* error */
|
2006-04-11 15:45:10 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Estimate number of suitable keys in the tree
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
estimated value
|
|
|
|
*/
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
ha_rows maria_rtree_estimate(MARIA_HA *info, uint keynr, uchar *key,
|
2006-04-11 15:45:10 +02:00
|
|
|
uint key_length, uint flag)
|
|
|
|
{
|
|
|
|
MARIA_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
my_off_t root;
|
|
|
|
uint i = 0;
|
2007-01-18 20:38:14 +01:00
|
|
|
uint nod_flag, k_len;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *page_buf, *k, *last;
|
2006-04-11 15:45:10 +02:00
|
|
|
double area = 0;
|
|
|
|
ha_rows res = 0;
|
|
|
|
|
|
|
|
if (flag & MBR_DISJOINT)
|
|
|
|
return info->state->records;
|
|
|
|
|
|
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
|
|
return HA_POS_ERROR;
|
2007-07-02 19:45:15 +02:00
|
|
|
if (!(page_buf= (uchar*) my_alloca((uint)keyinfo->block_length)))
|
2006-04-11 15:45:10 +02:00
|
|
|
return HA_POS_ERROR;
|
|
|
|
if (!_ma_fetch_keypage(info, keyinfo, root, DFLT_INIT_HITS, page_buf, 0))
|
|
|
|
goto err1;
|
|
|
|
nod_flag = _ma_test_if_nod(page_buf);
|
|
|
|
|
|
|
|
k_len = keyinfo->keylength - info->s->base.rec_reflength;
|
|
|
|
|
|
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
|
|
last = rt_PAGE_END(page_buf);
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag), i++)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (nod_flag)
|
|
|
|
{
|
|
|
|
double k_area = maria_rtree_rect_volume(keyinfo->seg, k, key_length);
|
|
|
|
|
|
|
|
/* The following should be safe, even if we compare doubles */
|
|
|
|
if (k_area == 0)
|
|
|
|
{
|
|
|
|
if (flag & (MBR_CONTAIN | MBR_INTERSECT))
|
|
|
|
{
|
|
|
|
area += 1;
|
|
|
|
}
|
|
|
|
else if (flag & (MBR_WITHIN | MBR_EQUAL))
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if (!maria_rtree_key_cmp(keyinfo->seg, key, k, key_length,
|
|
|
|
MBR_WITHIN))
|
2006-04-11 15:45:10 +02:00
|
|
|
area += 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (flag & (MBR_CONTAIN | MBR_INTERSECT))
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
area+= maria_rtree_overlapping_area(keyinfo->seg, key, k,
|
|
|
|
key_length) / k_area;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else if (flag & (MBR_WITHIN | MBR_EQUAL))
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if (!maria_rtree_key_cmp(keyinfo->seg, key, k, key_length,
|
|
|
|
MBR_WITHIN))
|
|
|
|
area+= (maria_rtree_rect_volume(keyinfo->seg, key, key_length) /
|
|
|
|
k_area);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!maria_rtree_key_cmp(keyinfo->seg, key, k, key_length, flag))
|
|
|
|
++res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (nod_flag)
|
|
|
|
{
|
|
|
|
if (i)
|
|
|
|
res = (ha_rows) (area / i * info->state->records);
|
|
|
|
else
|
|
|
|
res = HA_POS_ERROR;
|
|
|
|
}
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
my_afree((uchar*)page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return res;
|
|
|
|
|
|
|
|
err1:
|
2007-01-18 20:38:14 +01:00
|
|
|
my_afree(page_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
return HA_POS_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /*HAVE_RTREE_KEYS*/
|