2011-06-30 17:46:53 +02:00
|
|
|
/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
|
2002-02-20 11:11:21 +01:00
|
|
|
|
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2002-02-20 11:11:21 +01: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
|
2019-05-11 20:29:06 +02:00
|
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
|
2002-02-20 11:11:21 +01:00
|
|
|
|
|
|
|
/* Testing of the basic functions of a MyISAM rtree table */
|
|
|
|
/* Written by Alex Barkov who has a shared copyright to this code */
|
|
|
|
|
|
|
|
|
2017-06-18 05:42:16 +02:00
|
|
|
#include <my_global.h>
|
2002-02-20 11:11:21 +01:00
|
|
|
#include "myisam.h"
|
2004-03-12 15:51:03 +01:00
|
|
|
|
|
|
|
#ifdef HAVE_RTREE_KEYS
|
|
|
|
|
2002-02-20 11:11:21 +01:00
|
|
|
#include "rt_index.h"
|
|
|
|
|
|
|
|
#define MAX_REC_LENGTH 1024
|
|
|
|
#define ndims 2
|
|
|
|
#define KEYALG HA_KEY_ALG_RTREE
|
|
|
|
|
|
|
|
static int read_with_pos(MI_INFO * file, int silent);
|
2007-08-13 15:11:25 +02:00
|
|
|
static void create_record(uchar *record,uint rownr);
|
|
|
|
static void create_record1(uchar *record,uint rownr);
|
|
|
|
static void print_record(uchar * record,my_off_t offs,const char * tail);
|
2002-02-20 11:11:21 +01:00
|
|
|
static int run_test(const char *filename);
|
|
|
|
|
2004-06-02 16:11:57 +02:00
|
|
|
static double rt_data[]=
|
|
|
|
{
|
|
|
|
/*1*/ 0,10,0,10,
|
|
|
|
/*2*/ 5,15,0,10,
|
|
|
|
/*3*/ 0,10,5,15,
|
|
|
|
/*4*/ 10,20,10,20,
|
|
|
|
/*5*/ 0,10,0,10,
|
|
|
|
/*6*/ 5,15,0,10,
|
|
|
|
/*7*/ 0,10,5,15,
|
|
|
|
/*8*/ 10,20,10,20,
|
|
|
|
/*9*/ 0,10,0,10,
|
|
|
|
/*10*/ 5,15,0,10,
|
|
|
|
/*11*/ 0,10,5,15,
|
|
|
|
/*12*/ 10,20,10,20,
|
|
|
|
/*13*/ 0,10,0,10,
|
|
|
|
/*14*/ 5,15,0,10,
|
|
|
|
/*15*/ 0,10,5,15,
|
|
|
|
/*16*/ 10,20,10,20,
|
|
|
|
/*17*/ 5,15,0,10,
|
|
|
|
/*18*/ 0,10,5,15,
|
|
|
|
/*19*/ 10,20,10,20,
|
|
|
|
/*20*/ 0,10,0,10,
|
|
|
|
|
|
|
|
/*1*/ 100,110,0,10,
|
|
|
|
/*2*/ 105,115,0,10,
|
|
|
|
/*3*/ 100,110,5,15,
|
|
|
|
/*4*/ 110,120,10,20,
|
|
|
|
/*5*/ 100,110,0,10,
|
|
|
|
/*6*/ 105,115,0,10,
|
|
|
|
/*7*/ 100,110,5,15,
|
|
|
|
/*8*/ 110,120,10,20,
|
|
|
|
/*9*/ 100,110,0,10,
|
|
|
|
/*10*/ 105,115,0,10,
|
|
|
|
/*11*/ 100,110,5,15,
|
|
|
|
/*12*/ 110,120,10,20,
|
|
|
|
/*13*/ 100,110,0,10,
|
|
|
|
/*14*/ 105,115,0,10,
|
|
|
|
/*15*/ 100,110,5,15,
|
|
|
|
/*16*/ 110,120,10,20,
|
|
|
|
/*17*/ 105,115,0,10,
|
|
|
|
/*18*/ 100,110,5,15,
|
|
|
|
/*19*/ 110,120,10,20,
|
|
|
|
/*20*/ 100,110,0,10,
|
|
|
|
-1
|
|
|
|
};
|
2002-02-20 11:11:21 +01:00
|
|
|
|
2002-09-06 15:15:40 +02:00
|
|
|
int main(int argc __attribute__((unused)),char *argv[] __attribute__((unused)))
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
MY_INIT(argv[0]);
|
|
|
|
exit(run_test("rt_test"));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-05-19 04:09:10 +02:00
|
|
|
static int run_test(const char *filename)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
MI_INFO *file;
|
|
|
|
MI_UNIQUEDEF uniquedef;
|
|
|
|
MI_CREATE_INFO create_info;
|
|
|
|
MI_COLUMNDEF recinfo[20];
|
|
|
|
MI_KEYDEF keyinfo[20];
|
2002-04-25 12:10:29 +02:00
|
|
|
HA_KEYSEG keyseg[20];
|
2004-05-16 13:48:32 +02:00
|
|
|
key_range range;
|
2002-02-20 11:11:21 +01:00
|
|
|
|
|
|
|
int silent=0;
|
|
|
|
int opt_unique=0;
|
|
|
|
int create_flag=0;
|
|
|
|
int key_type=HA_KEYTYPE_DOUBLE;
|
|
|
|
int key_length=8;
|
|
|
|
int null_fields=0;
|
2004-06-02 16:11:57 +02:00
|
|
|
int nrecords=sizeof(rt_data)/(sizeof(double)*4);/* 3000;*/
|
2002-02-20 11:11:21 +01:00
|
|
|
int uniques=0;
|
WL#3072 - Maria Recovery
Recovery of R-tree and fulltext indices.
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using
repair-with-keycache method".
Fix for bug (see ma_rt_index.c) where we could have a wrong
page_link pointer causing wrong memory access during some R-tree
index insert/delete.
Making ma_rt_test work again (it had been neglected over time) and
adding options (record type etc) to prepare it for integration into
ma_test_all-t (but there is BUG#36321 about "ma_rt_test -M" crash)
mysql-test/r/maria.result:
correct result
mysql-test/t/maria.test:
now we get no error
storage/maria/ma_blockrec.c:
delete_dir_entry() and delete_head_or_tail() don't use info->keyread_buff.
ma_get_length() does not change **packet, marking it with 'const' to
remove some casts in callers of this function. The
(const uchar**)&header casts will be removed when Monty changes 'header'
to const uchar*.
_ma_apply_redo_purge_row_head_or_tail() sets 'buff' from pagecache_read()
so its initialization was superfluous.
storage/maria/ma_check.c:
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using repair-with-keycache method"
(see comment in code)
storage/maria/ma_create.c:
FULLTEXT and SPATIAL indices have logging now, they are recoverable.
storage/maria/ma_delete.c:
Logging done by _ma_ck_delete() is moved to a function
(_ma_write_undo_key_delete()), for reusal by R-tree logging.
_ma_log_delete() is made non-static for same
reason, and some of its parameters are made pointers to const.
Removed wrong comment ("Note that for delete key" etc, contradicted by
code and comment "Log also position to row" a few lines above)
storage/maria/ma_ft_update.c:
unneeded cast, comment for future
storage/maria/ma_key_recover.c:
Comment about possible deadlock.
Write bad page to DBUG trace if KEY_OP_CHECK founds bad CRC.
Support operation KEY_OP_MULTI_COPY.
When we execute, in UNDO phase, UNDO_KEY_DELETE|INSERT, we must call
the proper key insertion|deletion depending on if this is R-tree
or B-tree.
Explanation of of _ma_[un]lock_key_del() work, maybe useful for
mortals like me.
storage/maria/ma_key_recover.h:
change of prototypes
storage/maria/ma_loghandler.h:
New operation which can be stored in REDO_INDEX log records: KEY_OP_MULTI_COPY
storage/maria/ma_page.c:
Comments
storage/maria/ma_pagecache.c:
typo
storage/maria/ma_rt_index.c:
Fix for bug: the page_link pointer in maria_rtree_insert_req()
could be wrong when we set its 'changed' member; for the solution
see ma_key_recover.h. It is needed only in cases when we manipulate
several pages.
Logging of changes done to pages by key insert/delete.
maria_rtree_delete()'s main work is moved to a new function
maria_rtree_real_delete(), which is used by maria_rtree_delete()
and by applying of UNDO_KEY_INSERT.
storage/maria/ma_rt_index.h:
new prototypes and macros for ma_rt_index.c
storage/maria/ma_rt_key.c:
Logging of maria_rtree_add_key() and maria_rtree_delete_key().
When inserting, split is necessary if there is not enough room for key:
take checksum's occupied space in this calculation.
storage/maria/ma_rt_key.h:
new prototypes (those functions need to know the page's id
because they do logging)
storage/maria/ma_rt_mbr.c:
Comments about what the functions change.
storage/maria/ma_rt_split.c:
maria_rtree_split_page() needs to know the page's id, because
it does logging.
Logging of what a split operation does to the split page (see
comment of _ma_log_rt_split(): moves of keys inside the page,
sometimes insertion of the new key, and shrinking of the page)
and to the new page (receives some keys from split page, and
sometimes the new key).
storage/maria/ma_rt_test.c:
ma_rt_test had been forgotten when maria_rkey() was changed some months ago
(0->HA_WHOLE_KEY change), and when calls to maria_rnd(,,HA_OFFSET_ERROR)
were rewritten to maria_scan() calls (which implies maria_scan_init()).
The 'max_i' change is to adapt to the fact that maria_scan() does
not return deleted records for BLOCK_RECORD but does so for other formats;
the initial code assumed a certain number of deleted records would be
returned, we change it to rather count only non-deleted ones.
We also add more features to this test, like ma_test1 (the plan
is to run ma_rt_test in ma_test_all-t):
options to choose records' format, table checksum, transactions,
checkpoints, end at specific stages, abort without committing,
and debug trace.
storage/maria/ma_test1.c:
MY_INIT() does my_init().
storage/maria/ma_write.c:
Logging done by _ma_ck_write_btree_with_log() is moved to a function
(_ma_write_undo_key_insert()), for reusal by R-tree logging.
_ma_log_new() and _ma_log_change() are made non-static for same
reason. Some parameters of logging functions are made pointers to const.
If EXTRA_DEBUG_KEY_CHANGES, we now log CRC in _ma_log_change() too
(better checks, bigger record).
storage/maria/maria_read_log.c:
Program takes no arguments, bail out if any, instead of silently discarding them
storage/myisam/rt_test.c:
rt_test had been forgotten when mi_rkey() was changed some months ago
(0->HA_WHOLE_KEY change).
The 'max_i' change is to make it symmetric with ma_rt_test.c
mysql-test/r/maria-gis-rtree-dynamic.result:
correct result
mysql-test/r/maria-gis-rtree-trans.result:
correct result
mysql-test/r/maria-recovery-rtree-ft.result:
almost correct result (hitting BUG# in the end)
mysql-test/t/maria-gis-rtree-dynamic.test:
test R-tree & dynamic row format
mysql-test/t/maria-gis-rtree-trans.test:
Test R-tree and page row format and transactional
mysql-test/t/maria-recovery-rtree-ft-master.opt:
usual options for recovery testing
mysql-test/t/maria-recovery-rtree-ft.test:
test of recovery of R-tree and fulltext indices.
2008-04-24 17:22:51 +02:00
|
|
|
int i, max_i;
|
2002-02-20 11:11:21 +01:00
|
|
|
int error;
|
|
|
|
int row_count=0;
|
2007-08-13 15:11:25 +02:00
|
|
|
uchar record[MAX_REC_LENGTH];
|
|
|
|
uchar read_record[MAX_REC_LENGTH];
|
2002-10-02 13:14:36 +02:00
|
|
|
int upd= 10;
|
2002-02-20 11:11:21 +01:00
|
|
|
ha_rows hrows;
|
2020-02-27 18:12:27 +01:00
|
|
|
page_range pages;
|
Fix for Valgrind errors when running rt_test and ma_rt_test, and segmentation fault
in ma_rt_test -M (BUG#36321); keyinfo/recinfo/keyseg had non-initialized parts.
maria_scan() was not wrapped in maria_scan_init()/end() so "ma_rt_test -M" found no rows.
Preparing for inclusion into ma_test_all-t and ma_test_recovery.pl (still prevented by
BUG#37307 "Maria: R-tree unit test produces corrupted table").
storage/maria/ma_rt_test.c:
Some members of keyinfo, recinfo, keyseg had non-initialized parts, led to Valgrind errors,
and also segmentation fault when running with -M (=BLOCK_RECORD) (BUG#36321).
We now bzero them like they are in mi_test1.
Other problems:
- maria_scan() was not wrapped in maria_scan_init()/end() so "ma_rt_test -M" found no rows.
- --silent had almost no effect, now it really silences normal output.
- Some errors were going to stdout, they now go to stderr.
Added option for testing versioning, to fit well into ma_test_all-t.
storage/maria/unittest/ma_test_all-t:
preparing for running ma_rt_test when ma_rt_test remaining bugs are fixed
storage/maria/unittest/ma_test_recovery.pl:
preparing for running ma_rt_test when ma_rt_test remaining bugs are fixed
storage/myisam/rt_test.c:
Some members of keyinfo, recinfo, keyseg were not initialized, led to Valgrind errors.
We now bzero them like they are in mi_test1.
2008-06-10 15:44:41 +02:00
|
|
|
|
|
|
|
bzero(&uniquedef, sizeof(uniquedef));
|
|
|
|
bzero(&create_info, sizeof(create_info));
|
|
|
|
bzero(recinfo, sizeof(recinfo));
|
|
|
|
bzero(keyinfo, sizeof(keyinfo));
|
|
|
|
bzero(keyseg, sizeof(keyseg));
|
|
|
|
|
2002-02-20 11:11:21 +01:00
|
|
|
/* Define a column for NULLs and DEL markers*/
|
|
|
|
|
|
|
|
recinfo[0].type=FIELD_NORMAL;
|
|
|
|
recinfo[0].length=1; /* For NULL bits */
|
|
|
|
|
|
|
|
/* Define 2*ndims columns for coordinates*/
|
|
|
|
|
|
|
|
for (i=1; i<=2*ndims ;i++){
|
|
|
|
recinfo[i].type=FIELD_NORMAL;
|
|
|
|
recinfo[i].length=key_length;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Define a key with 2*ndims segments */
|
|
|
|
|
|
|
|
keyinfo[0].seg=keyseg;
|
|
|
|
keyinfo[0].keysegs=2*ndims;
|
|
|
|
keyinfo[0].flag=0;
|
|
|
|
keyinfo[0].key_alg=KEYALG;
|
|
|
|
|
|
|
|
for (i=0; i<2*ndims; i++){
|
|
|
|
keyinfo[0].seg[i].type= key_type;
|
|
|
|
keyinfo[0].seg[i].flag=0; /* Things like HA_REVERSE_SORT */
|
|
|
|
keyinfo[0].seg[i].start= (key_length*i)+1;
|
|
|
|
keyinfo[0].seg[i].length=key_length;
|
|
|
|
keyinfo[0].seg[i].null_bit= null_fields ? 2 : 0;
|
|
|
|
keyinfo[0].seg[i].null_pos=0;
|
2003-06-03 11:59:17 +02:00
|
|
|
keyinfo[0].seg[i].language=default_charset_info->number;
|
2002-02-20 11:11:21 +01:00
|
|
|
}
|
|
|
|
|
2004-05-16 13:48:32 +02:00
|
|
|
if (!silent)
|
2002-02-20 11:11:21 +01:00
|
|
|
printf("- Creating isam-file\n");
|
|
|
|
|
|
|
|
create_info.max_rows=10000000;
|
|
|
|
|
|
|
|
if (mi_create(filename,
|
|
|
|
1, /* keys */
|
|
|
|
keyinfo,
|
|
|
|
1+2*ndims+opt_unique, /* columns */
|
|
|
|
recinfo,uniques,&uniquedef,&create_info,create_flag))
|
|
|
|
goto err;
|
|
|
|
|
2004-05-16 13:48:32 +02:00
|
|
|
if (!silent)
|
2002-02-20 11:11:21 +01:00
|
|
|
printf("- Open isam-file\n");
|
|
|
|
|
|
|
|
if (!(file=mi_open(filename,2,HA_OPEN_ABORT_IF_LOCKED)))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Writing key:s\n");
|
|
|
|
|
|
|
|
for (i=0; i<nrecords; i++ )
|
|
|
|
{
|
|
|
|
create_record(record,i);
|
|
|
|
error=mi_write(file,record);
|
|
|
|
print_record(record,mi_position(file),"\n");
|
|
|
|
if (!error)
|
|
|
|
{
|
|
|
|
row_count++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
printf("mi_write: %d\n", error);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-16 13:48:32 +02:00
|
|
|
if ((error=read_with_pos(file,silent)))
|
2002-02-20 11:11:21 +01:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Reading rows with key\n");
|
|
|
|
|
|
|
|
for (i=0 ; i < nrecords ; i++)
|
|
|
|
{
|
|
|
|
my_errno=0;
|
|
|
|
create_record(record,i);
|
|
|
|
|
|
|
|
bzero((char*) read_record,MAX_REC_LENGTH);
|
WL#3072 - Maria Recovery
Recovery of R-tree and fulltext indices.
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using
repair-with-keycache method".
Fix for bug (see ma_rt_index.c) where we could have a wrong
page_link pointer causing wrong memory access during some R-tree
index insert/delete.
Making ma_rt_test work again (it had been neglected over time) and
adding options (record type etc) to prepare it for integration into
ma_test_all-t (but there is BUG#36321 about "ma_rt_test -M" crash)
mysql-test/r/maria.result:
correct result
mysql-test/t/maria.test:
now we get no error
storage/maria/ma_blockrec.c:
delete_dir_entry() and delete_head_or_tail() don't use info->keyread_buff.
ma_get_length() does not change **packet, marking it with 'const' to
remove some casts in callers of this function. The
(const uchar**)&header casts will be removed when Monty changes 'header'
to const uchar*.
_ma_apply_redo_purge_row_head_or_tail() sets 'buff' from pagecache_read()
so its initialization was superfluous.
storage/maria/ma_check.c:
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using repair-with-keycache method"
(see comment in code)
storage/maria/ma_create.c:
FULLTEXT and SPATIAL indices have logging now, they are recoverable.
storage/maria/ma_delete.c:
Logging done by _ma_ck_delete() is moved to a function
(_ma_write_undo_key_delete()), for reusal by R-tree logging.
_ma_log_delete() is made non-static for same
reason, and some of its parameters are made pointers to const.
Removed wrong comment ("Note that for delete key" etc, contradicted by
code and comment "Log also position to row" a few lines above)
storage/maria/ma_ft_update.c:
unneeded cast, comment for future
storage/maria/ma_key_recover.c:
Comment about possible deadlock.
Write bad page to DBUG trace if KEY_OP_CHECK founds bad CRC.
Support operation KEY_OP_MULTI_COPY.
When we execute, in UNDO phase, UNDO_KEY_DELETE|INSERT, we must call
the proper key insertion|deletion depending on if this is R-tree
or B-tree.
Explanation of of _ma_[un]lock_key_del() work, maybe useful for
mortals like me.
storage/maria/ma_key_recover.h:
change of prototypes
storage/maria/ma_loghandler.h:
New operation which can be stored in REDO_INDEX log records: KEY_OP_MULTI_COPY
storage/maria/ma_page.c:
Comments
storage/maria/ma_pagecache.c:
typo
storage/maria/ma_rt_index.c:
Fix for bug: the page_link pointer in maria_rtree_insert_req()
could be wrong when we set its 'changed' member; for the solution
see ma_key_recover.h. It is needed only in cases when we manipulate
several pages.
Logging of changes done to pages by key insert/delete.
maria_rtree_delete()'s main work is moved to a new function
maria_rtree_real_delete(), which is used by maria_rtree_delete()
and by applying of UNDO_KEY_INSERT.
storage/maria/ma_rt_index.h:
new prototypes and macros for ma_rt_index.c
storage/maria/ma_rt_key.c:
Logging of maria_rtree_add_key() and maria_rtree_delete_key().
When inserting, split is necessary if there is not enough room for key:
take checksum's occupied space in this calculation.
storage/maria/ma_rt_key.h:
new prototypes (those functions need to know the page's id
because they do logging)
storage/maria/ma_rt_mbr.c:
Comments about what the functions change.
storage/maria/ma_rt_split.c:
maria_rtree_split_page() needs to know the page's id, because
it does logging.
Logging of what a split operation does to the split page (see
comment of _ma_log_rt_split(): moves of keys inside the page,
sometimes insertion of the new key, and shrinking of the page)
and to the new page (receives some keys from split page, and
sometimes the new key).
storage/maria/ma_rt_test.c:
ma_rt_test had been forgotten when maria_rkey() was changed some months ago
(0->HA_WHOLE_KEY change), and when calls to maria_rnd(,,HA_OFFSET_ERROR)
were rewritten to maria_scan() calls (which implies maria_scan_init()).
The 'max_i' change is to adapt to the fact that maria_scan() does
not return deleted records for BLOCK_RECORD but does so for other formats;
the initial code assumed a certain number of deleted records would be
returned, we change it to rather count only non-deleted ones.
We also add more features to this test, like ma_test1 (the plan
is to run ma_rt_test in ma_test_all-t):
options to choose records' format, table checksum, transactions,
checkpoints, end at specific stages, abort without committing,
and debug trace.
storage/maria/ma_test1.c:
MY_INIT() does my_init().
storage/maria/ma_write.c:
Logging done by _ma_ck_write_btree_with_log() is moved to a function
(_ma_write_undo_key_insert()), for reusal by R-tree logging.
_ma_log_new() and _ma_log_change() are made non-static for same
reason. Some parameters of logging functions are made pointers to const.
If EXTRA_DEBUG_KEY_CHANGES, we now log CRC in _ma_log_change() too
(better checks, bigger record).
storage/maria/maria_read_log.c:
Program takes no arguments, bail out if any, instead of silently discarding them
storage/myisam/rt_test.c:
rt_test had been forgotten when mi_rkey() was changed some months ago
(0->HA_WHOLE_KEY change).
The 'max_i' change is to make it symmetric with ma_rt_test.c
mysql-test/r/maria-gis-rtree-dynamic.result:
correct result
mysql-test/r/maria-gis-rtree-trans.result:
correct result
mysql-test/r/maria-recovery-rtree-ft.result:
almost correct result (hitting BUG# in the end)
mysql-test/t/maria-gis-rtree-dynamic.test:
test R-tree & dynamic row format
mysql-test/t/maria-gis-rtree-trans.test:
Test R-tree and page row format and transactional
mysql-test/t/maria-recovery-rtree-ft-master.opt:
usual options for recovery testing
mysql-test/t/maria-recovery-rtree-ft.test:
test of recovery of R-tree and fulltext indices.
2008-04-24 17:22:51 +02:00
|
|
|
error=mi_rkey(file,read_record,0,record+1,HA_WHOLE_KEY,HA_READ_MBR_EQUAL);
|
2002-02-20 11:11:21 +01:00
|
|
|
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error && error!=HA_ERR_KEY_NOT_FOUND)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
printf(" mi_rkey: %3d errno: %3d\n",error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error == HA_ERR_KEY_NOT_FOUND)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
print_record(record,mi_position(file)," NOT FOUND\n");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
print_record(read_record,mi_position(file),"\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Deleting rows\n");
|
|
|
|
for (i=0; i < nrecords/4; i++)
|
|
|
|
{
|
|
|
|
my_errno=0;
|
|
|
|
bzero((char*) read_record,MAX_REC_LENGTH);
|
|
|
|
error=mi_rrnd(file,read_record,i == 0 ? 0L : HA_OFFSET_ERROR);
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
printf("pos: %2d mi_rrnd: %3d errno: %3d\n",i,error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
print_record(read_record,mi_position(file),"\n");
|
|
|
|
|
|
|
|
error=mi_delete(file,read_record);
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
printf("pos: %2d mi_delete: %3d errno: %3d\n",i,error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Updating rows with position\n");
|
WL#3072 - Maria Recovery
Recovery of R-tree and fulltext indices.
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using
repair-with-keycache method".
Fix for bug (see ma_rt_index.c) where we could have a wrong
page_link pointer causing wrong memory access during some R-tree
index insert/delete.
Making ma_rt_test work again (it had been neglected over time) and
adding options (record type etc) to prepare it for integration into
ma_test_all-t (but there is BUG#36321 about "ma_rt_test -M" crash)
mysql-test/r/maria.result:
correct result
mysql-test/t/maria.test:
now we get no error
storage/maria/ma_blockrec.c:
delete_dir_entry() and delete_head_or_tail() don't use info->keyread_buff.
ma_get_length() does not change **packet, marking it with 'const' to
remove some casts in callers of this function. The
(const uchar**)&header casts will be removed when Monty changes 'header'
to const uchar*.
_ma_apply_redo_purge_row_head_or_tail() sets 'buff' from pagecache_read()
so its initialization was superfluous.
storage/maria/ma_check.c:
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using repair-with-keycache method"
(see comment in code)
storage/maria/ma_create.c:
FULLTEXT and SPATIAL indices have logging now, they are recoverable.
storage/maria/ma_delete.c:
Logging done by _ma_ck_delete() is moved to a function
(_ma_write_undo_key_delete()), for reusal by R-tree logging.
_ma_log_delete() is made non-static for same
reason, and some of its parameters are made pointers to const.
Removed wrong comment ("Note that for delete key" etc, contradicted by
code and comment "Log also position to row" a few lines above)
storage/maria/ma_ft_update.c:
unneeded cast, comment for future
storage/maria/ma_key_recover.c:
Comment about possible deadlock.
Write bad page to DBUG trace if KEY_OP_CHECK founds bad CRC.
Support operation KEY_OP_MULTI_COPY.
When we execute, in UNDO phase, UNDO_KEY_DELETE|INSERT, we must call
the proper key insertion|deletion depending on if this is R-tree
or B-tree.
Explanation of of _ma_[un]lock_key_del() work, maybe useful for
mortals like me.
storage/maria/ma_key_recover.h:
change of prototypes
storage/maria/ma_loghandler.h:
New operation which can be stored in REDO_INDEX log records: KEY_OP_MULTI_COPY
storage/maria/ma_page.c:
Comments
storage/maria/ma_pagecache.c:
typo
storage/maria/ma_rt_index.c:
Fix for bug: the page_link pointer in maria_rtree_insert_req()
could be wrong when we set its 'changed' member; for the solution
see ma_key_recover.h. It is needed only in cases when we manipulate
several pages.
Logging of changes done to pages by key insert/delete.
maria_rtree_delete()'s main work is moved to a new function
maria_rtree_real_delete(), which is used by maria_rtree_delete()
and by applying of UNDO_KEY_INSERT.
storage/maria/ma_rt_index.h:
new prototypes and macros for ma_rt_index.c
storage/maria/ma_rt_key.c:
Logging of maria_rtree_add_key() and maria_rtree_delete_key().
When inserting, split is necessary if there is not enough room for key:
take checksum's occupied space in this calculation.
storage/maria/ma_rt_key.h:
new prototypes (those functions need to know the page's id
because they do logging)
storage/maria/ma_rt_mbr.c:
Comments about what the functions change.
storage/maria/ma_rt_split.c:
maria_rtree_split_page() needs to know the page's id, because
it does logging.
Logging of what a split operation does to the split page (see
comment of _ma_log_rt_split(): moves of keys inside the page,
sometimes insertion of the new key, and shrinking of the page)
and to the new page (receives some keys from split page, and
sometimes the new key).
storage/maria/ma_rt_test.c:
ma_rt_test had been forgotten when maria_rkey() was changed some months ago
(0->HA_WHOLE_KEY change), and when calls to maria_rnd(,,HA_OFFSET_ERROR)
were rewritten to maria_scan() calls (which implies maria_scan_init()).
The 'max_i' change is to adapt to the fact that maria_scan() does
not return deleted records for BLOCK_RECORD but does so for other formats;
the initial code assumed a certain number of deleted records would be
returned, we change it to rather count only non-deleted ones.
We also add more features to this test, like ma_test1 (the plan
is to run ma_rt_test in ma_test_all-t):
options to choose records' format, table checksum, transactions,
checkpoints, end at specific stages, abort without committing,
and debug trace.
storage/maria/ma_test1.c:
MY_INIT() does my_init().
storage/maria/ma_write.c:
Logging done by _ma_ck_write_btree_with_log() is moved to a function
(_ma_write_undo_key_insert()), for reusal by R-tree logging.
_ma_log_new() and _ma_log_change() are made non-static for same
reason. Some parameters of logging functions are made pointers to const.
If EXTRA_DEBUG_KEY_CHANGES, we now log CRC in _ma_log_change() too
(better checks, bigger record).
storage/maria/maria_read_log.c:
Program takes no arguments, bail out if any, instead of silently discarding them
storage/myisam/rt_test.c:
rt_test had been forgotten when mi_rkey() was changed some months ago
(0->HA_WHOLE_KEY change).
The 'max_i' change is to make it symmetric with ma_rt_test.c
mysql-test/r/maria-gis-rtree-dynamic.result:
correct result
mysql-test/r/maria-gis-rtree-trans.result:
correct result
mysql-test/r/maria-recovery-rtree-ft.result:
almost correct result (hitting BUG# in the end)
mysql-test/t/maria-gis-rtree-dynamic.test:
test R-tree & dynamic row format
mysql-test/t/maria-gis-rtree-trans.test:
Test R-tree and page row format and transactional
mysql-test/t/maria-recovery-rtree-ft-master.opt:
usual options for recovery testing
mysql-test/t/maria-recovery-rtree-ft.test:
test of recovery of R-tree and fulltext indices.
2008-04-24 17:22:51 +02:00
|
|
|
/* We are looking for nrecords-necords/2 non-deleted records */
|
|
|
|
for (i=0, max_i= nrecords - nrecords/2; i < max_i ; i++)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
my_errno=0;
|
|
|
|
bzero((char*) read_record,MAX_REC_LENGTH);
|
|
|
|
error=mi_rrnd(file,read_record,i == 0 ? 0L : HA_OFFSET_ERROR);
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error==HA_ERR_RECORD_DELETED)
|
WL#3072 - Maria Recovery
Recovery of R-tree and fulltext indices.
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using
repair-with-keycache method".
Fix for bug (see ma_rt_index.c) where we could have a wrong
page_link pointer causing wrong memory access during some R-tree
index insert/delete.
Making ma_rt_test work again (it had been neglected over time) and
adding options (record type etc) to prepare it for integration into
ma_test_all-t (but there is BUG#36321 about "ma_rt_test -M" crash)
mysql-test/r/maria.result:
correct result
mysql-test/t/maria.test:
now we get no error
storage/maria/ma_blockrec.c:
delete_dir_entry() and delete_head_or_tail() don't use info->keyread_buff.
ma_get_length() does not change **packet, marking it with 'const' to
remove some casts in callers of this function. The
(const uchar**)&header casts will be removed when Monty changes 'header'
to const uchar*.
_ma_apply_redo_purge_row_head_or_tail() sets 'buff' from pagecache_read()
so its initialization was superfluous.
storage/maria/ma_check.c:
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using repair-with-keycache method"
(see comment in code)
storage/maria/ma_create.c:
FULLTEXT and SPATIAL indices have logging now, they are recoverable.
storage/maria/ma_delete.c:
Logging done by _ma_ck_delete() is moved to a function
(_ma_write_undo_key_delete()), for reusal by R-tree logging.
_ma_log_delete() is made non-static for same
reason, and some of its parameters are made pointers to const.
Removed wrong comment ("Note that for delete key" etc, contradicted by
code and comment "Log also position to row" a few lines above)
storage/maria/ma_ft_update.c:
unneeded cast, comment for future
storage/maria/ma_key_recover.c:
Comment about possible deadlock.
Write bad page to DBUG trace if KEY_OP_CHECK founds bad CRC.
Support operation KEY_OP_MULTI_COPY.
When we execute, in UNDO phase, UNDO_KEY_DELETE|INSERT, we must call
the proper key insertion|deletion depending on if this is R-tree
or B-tree.
Explanation of of _ma_[un]lock_key_del() work, maybe useful for
mortals like me.
storage/maria/ma_key_recover.h:
change of prototypes
storage/maria/ma_loghandler.h:
New operation which can be stored in REDO_INDEX log records: KEY_OP_MULTI_COPY
storage/maria/ma_page.c:
Comments
storage/maria/ma_pagecache.c:
typo
storage/maria/ma_rt_index.c:
Fix for bug: the page_link pointer in maria_rtree_insert_req()
could be wrong when we set its 'changed' member; for the solution
see ma_key_recover.h. It is needed only in cases when we manipulate
several pages.
Logging of changes done to pages by key insert/delete.
maria_rtree_delete()'s main work is moved to a new function
maria_rtree_real_delete(), which is used by maria_rtree_delete()
and by applying of UNDO_KEY_INSERT.
storage/maria/ma_rt_index.h:
new prototypes and macros for ma_rt_index.c
storage/maria/ma_rt_key.c:
Logging of maria_rtree_add_key() and maria_rtree_delete_key().
When inserting, split is necessary if there is not enough room for key:
take checksum's occupied space in this calculation.
storage/maria/ma_rt_key.h:
new prototypes (those functions need to know the page's id
because they do logging)
storage/maria/ma_rt_mbr.c:
Comments about what the functions change.
storage/maria/ma_rt_split.c:
maria_rtree_split_page() needs to know the page's id, because
it does logging.
Logging of what a split operation does to the split page (see
comment of _ma_log_rt_split(): moves of keys inside the page,
sometimes insertion of the new key, and shrinking of the page)
and to the new page (receives some keys from split page, and
sometimes the new key).
storage/maria/ma_rt_test.c:
ma_rt_test had been forgotten when maria_rkey() was changed some months ago
(0->HA_WHOLE_KEY change), and when calls to maria_rnd(,,HA_OFFSET_ERROR)
were rewritten to maria_scan() calls (which implies maria_scan_init()).
The 'max_i' change is to adapt to the fact that maria_scan() does
not return deleted records for BLOCK_RECORD but does so for other formats;
the initial code assumed a certain number of deleted records would be
returned, we change it to rather count only non-deleted ones.
We also add more features to this test, like ma_test1 (the plan
is to run ma_rt_test in ma_test_all-t):
options to choose records' format, table checksum, transactions,
checkpoints, end at specific stages, abort without committing,
and debug trace.
storage/maria/ma_test1.c:
MY_INIT() does my_init().
storage/maria/ma_write.c:
Logging done by _ma_ck_write_btree_with_log() is moved to a function
(_ma_write_undo_key_insert()), for reusal by R-tree logging.
_ma_log_new() and _ma_log_change() are made non-static for same
reason. Some parameters of logging functions are made pointers to const.
If EXTRA_DEBUG_KEY_CHANGES, we now log CRC in _ma_log_change() too
(better checks, bigger record).
storage/maria/maria_read_log.c:
Program takes no arguments, bail out if any, instead of silently discarding them
storage/myisam/rt_test.c:
rt_test had been forgotten when mi_rkey() was changed some months ago
(0->HA_WHOLE_KEY change).
The 'max_i' change is to make it symmetric with ma_rt_test.c
mysql-test/r/maria-gis-rtree-dynamic.result:
correct result
mysql-test/r/maria-gis-rtree-trans.result:
correct result
mysql-test/r/maria-recovery-rtree-ft.result:
almost correct result (hitting BUG# in the end)
mysql-test/t/maria-gis-rtree-dynamic.test:
test R-tree & dynamic row format
mysql-test/t/maria-gis-rtree-trans.test:
Test R-tree and page row format and transactional
mysql-test/t/maria-recovery-rtree-ft-master.opt:
usual options for recovery testing
mysql-test/t/maria-recovery-rtree-ft.test:
test of recovery of R-tree and fulltext indices.
2008-04-24 17:22:51 +02:00
|
|
|
{
|
|
|
|
printf("found deleted record\n");
|
|
|
|
max_i++; /* don't count such record */
|
2002-02-20 11:11:21 +01:00
|
|
|
continue;
|
WL#3072 - Maria Recovery
Recovery of R-tree and fulltext indices.
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using
repair-with-keycache method".
Fix for bug (see ma_rt_index.c) where we could have a wrong
page_link pointer causing wrong memory access during some R-tree
index insert/delete.
Making ma_rt_test work again (it had been neglected over time) and
adding options (record type etc) to prepare it for integration into
ma_test_all-t (but there is BUG#36321 about "ma_rt_test -M" crash)
mysql-test/r/maria.result:
correct result
mysql-test/t/maria.test:
now we get no error
storage/maria/ma_blockrec.c:
delete_dir_entry() and delete_head_or_tail() don't use info->keyread_buff.
ma_get_length() does not change **packet, marking it with 'const' to
remove some casts in callers of this function. The
(const uchar**)&header casts will be removed when Monty changes 'header'
to const uchar*.
_ma_apply_redo_purge_row_head_or_tail() sets 'buff' from pagecache_read()
so its initialization was superfluous.
storage/maria/ma_check.c:
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using repair-with-keycache method"
(see comment in code)
storage/maria/ma_create.c:
FULLTEXT and SPATIAL indices have logging now, they are recoverable.
storage/maria/ma_delete.c:
Logging done by _ma_ck_delete() is moved to a function
(_ma_write_undo_key_delete()), for reusal by R-tree logging.
_ma_log_delete() is made non-static for same
reason, and some of its parameters are made pointers to const.
Removed wrong comment ("Note that for delete key" etc, contradicted by
code and comment "Log also position to row" a few lines above)
storage/maria/ma_ft_update.c:
unneeded cast, comment for future
storage/maria/ma_key_recover.c:
Comment about possible deadlock.
Write bad page to DBUG trace if KEY_OP_CHECK founds bad CRC.
Support operation KEY_OP_MULTI_COPY.
When we execute, in UNDO phase, UNDO_KEY_DELETE|INSERT, we must call
the proper key insertion|deletion depending on if this is R-tree
or B-tree.
Explanation of of _ma_[un]lock_key_del() work, maybe useful for
mortals like me.
storage/maria/ma_key_recover.h:
change of prototypes
storage/maria/ma_loghandler.h:
New operation which can be stored in REDO_INDEX log records: KEY_OP_MULTI_COPY
storage/maria/ma_page.c:
Comments
storage/maria/ma_pagecache.c:
typo
storage/maria/ma_rt_index.c:
Fix for bug: the page_link pointer in maria_rtree_insert_req()
could be wrong when we set its 'changed' member; for the solution
see ma_key_recover.h. It is needed only in cases when we manipulate
several pages.
Logging of changes done to pages by key insert/delete.
maria_rtree_delete()'s main work is moved to a new function
maria_rtree_real_delete(), which is used by maria_rtree_delete()
and by applying of UNDO_KEY_INSERT.
storage/maria/ma_rt_index.h:
new prototypes and macros for ma_rt_index.c
storage/maria/ma_rt_key.c:
Logging of maria_rtree_add_key() and maria_rtree_delete_key().
When inserting, split is necessary if there is not enough room for key:
take checksum's occupied space in this calculation.
storage/maria/ma_rt_key.h:
new prototypes (those functions need to know the page's id
because they do logging)
storage/maria/ma_rt_mbr.c:
Comments about what the functions change.
storage/maria/ma_rt_split.c:
maria_rtree_split_page() needs to know the page's id, because
it does logging.
Logging of what a split operation does to the split page (see
comment of _ma_log_rt_split(): moves of keys inside the page,
sometimes insertion of the new key, and shrinking of the page)
and to the new page (receives some keys from split page, and
sometimes the new key).
storage/maria/ma_rt_test.c:
ma_rt_test had been forgotten when maria_rkey() was changed some months ago
(0->HA_WHOLE_KEY change), and when calls to maria_rnd(,,HA_OFFSET_ERROR)
were rewritten to maria_scan() calls (which implies maria_scan_init()).
The 'max_i' change is to adapt to the fact that maria_scan() does
not return deleted records for BLOCK_RECORD but does so for other formats;
the initial code assumed a certain number of deleted records would be
returned, we change it to rather count only non-deleted ones.
We also add more features to this test, like ma_test1 (the plan
is to run ma_rt_test in ma_test_all-t):
options to choose records' format, table checksum, transactions,
checkpoints, end at specific stages, abort without committing,
and debug trace.
storage/maria/ma_test1.c:
MY_INIT() does my_init().
storage/maria/ma_write.c:
Logging done by _ma_ck_write_btree_with_log() is moved to a function
(_ma_write_undo_key_insert()), for reusal by R-tree logging.
_ma_log_new() and _ma_log_change() are made non-static for same
reason. Some parameters of logging functions are made pointers to const.
If EXTRA_DEBUG_KEY_CHANGES, we now log CRC in _ma_log_change() too
(better checks, bigger record).
storage/maria/maria_read_log.c:
Program takes no arguments, bail out if any, instead of silently discarding them
storage/myisam/rt_test.c:
rt_test had been forgotten when mi_rkey() was changed some months ago
(0->HA_WHOLE_KEY change).
The 'max_i' change is to make it symmetric with ma_rt_test.c
mysql-test/r/maria-gis-rtree-dynamic.result:
correct result
mysql-test/r/maria-gis-rtree-trans.result:
correct result
mysql-test/r/maria-recovery-rtree-ft.result:
almost correct result (hitting BUG# in the end)
mysql-test/t/maria-gis-rtree-dynamic.test:
test R-tree & dynamic row format
mysql-test/t/maria-gis-rtree-trans.test:
Test R-tree and page row format and transactional
mysql-test/t/maria-recovery-rtree-ft-master.opt:
usual options for recovery testing
mysql-test/t/maria-recovery-rtree-ft.test:
test of recovery of R-tree and fulltext indices.
2008-04-24 17:22:51 +02:00
|
|
|
}
|
2002-02-20 11:11:21 +01:00
|
|
|
printf("pos: %2d mi_rrnd: %3d errno: %3d\n",i,error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
print_record(read_record,mi_position(file),"");
|
|
|
|
create_record(record,i+nrecords*upd);
|
|
|
|
printf("\t-> ");
|
|
|
|
print_record(record,mi_position(file),"\n");
|
|
|
|
error=mi_update(file,read_record,record);
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
printf("pos: %2d mi_update: %3d errno: %3d\n",i,error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-16 13:48:32 +02:00
|
|
|
if ((error=read_with_pos(file,silent)))
|
2002-02-20 11:11:21 +01:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Test mi_rkey then a sequence of mi_rnext_same\n");
|
|
|
|
|
|
|
|
create_record(record, nrecords*4/5);
|
|
|
|
print_record(record,0," search for\n");
|
|
|
|
|
WL#3072 - Maria Recovery
Recovery of R-tree and fulltext indices.
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using
repair-with-keycache method".
Fix for bug (see ma_rt_index.c) where we could have a wrong
page_link pointer causing wrong memory access during some R-tree
index insert/delete.
Making ma_rt_test work again (it had been neglected over time) and
adding options (record type etc) to prepare it for integration into
ma_test_all-t (but there is BUG#36321 about "ma_rt_test -M" crash)
mysql-test/r/maria.result:
correct result
mysql-test/t/maria.test:
now we get no error
storage/maria/ma_blockrec.c:
delete_dir_entry() and delete_head_or_tail() don't use info->keyread_buff.
ma_get_length() does not change **packet, marking it with 'const' to
remove some casts in callers of this function. The
(const uchar**)&header casts will be removed when Monty changes 'header'
to const uchar*.
_ma_apply_redo_purge_row_head_or_tail() sets 'buff' from pagecache_read()
so its initialization was superfluous.
storage/maria/ma_check.c:
Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using repair-with-keycache method"
(see comment in code)
storage/maria/ma_create.c:
FULLTEXT and SPATIAL indices have logging now, they are recoverable.
storage/maria/ma_delete.c:
Logging done by _ma_ck_delete() is moved to a function
(_ma_write_undo_key_delete()), for reusal by R-tree logging.
_ma_log_delete() is made non-static for same
reason, and some of its parameters are made pointers to const.
Removed wrong comment ("Note that for delete key" etc, contradicted by
code and comment "Log also position to row" a few lines above)
storage/maria/ma_ft_update.c:
unneeded cast, comment for future
storage/maria/ma_key_recover.c:
Comment about possible deadlock.
Write bad page to DBUG trace if KEY_OP_CHECK founds bad CRC.
Support operation KEY_OP_MULTI_COPY.
When we execute, in UNDO phase, UNDO_KEY_DELETE|INSERT, we must call
the proper key insertion|deletion depending on if this is R-tree
or B-tree.
Explanation of of _ma_[un]lock_key_del() work, maybe useful for
mortals like me.
storage/maria/ma_key_recover.h:
change of prototypes
storage/maria/ma_loghandler.h:
New operation which can be stored in REDO_INDEX log records: KEY_OP_MULTI_COPY
storage/maria/ma_page.c:
Comments
storage/maria/ma_pagecache.c:
typo
storage/maria/ma_rt_index.c:
Fix for bug: the page_link pointer in maria_rtree_insert_req()
could be wrong when we set its 'changed' member; for the solution
see ma_key_recover.h. It is needed only in cases when we manipulate
several pages.
Logging of changes done to pages by key insert/delete.
maria_rtree_delete()'s main work is moved to a new function
maria_rtree_real_delete(), which is used by maria_rtree_delete()
and by applying of UNDO_KEY_INSERT.
storage/maria/ma_rt_index.h:
new prototypes and macros for ma_rt_index.c
storage/maria/ma_rt_key.c:
Logging of maria_rtree_add_key() and maria_rtree_delete_key().
When inserting, split is necessary if there is not enough room for key:
take checksum's occupied space in this calculation.
storage/maria/ma_rt_key.h:
new prototypes (those functions need to know the page's id
because they do logging)
storage/maria/ma_rt_mbr.c:
Comments about what the functions change.
storage/maria/ma_rt_split.c:
maria_rtree_split_page() needs to know the page's id, because
it does logging.
Logging of what a split operation does to the split page (see
comment of _ma_log_rt_split(): moves of keys inside the page,
sometimes insertion of the new key, and shrinking of the page)
and to the new page (receives some keys from split page, and
sometimes the new key).
storage/maria/ma_rt_test.c:
ma_rt_test had been forgotten when maria_rkey() was changed some months ago
(0->HA_WHOLE_KEY change), and when calls to maria_rnd(,,HA_OFFSET_ERROR)
were rewritten to maria_scan() calls (which implies maria_scan_init()).
The 'max_i' change is to adapt to the fact that maria_scan() does
not return deleted records for BLOCK_RECORD but does so for other formats;
the initial code assumed a certain number of deleted records would be
returned, we change it to rather count only non-deleted ones.
We also add more features to this test, like ma_test1 (the plan
is to run ma_rt_test in ma_test_all-t):
options to choose records' format, table checksum, transactions,
checkpoints, end at specific stages, abort without committing,
and debug trace.
storage/maria/ma_test1.c:
MY_INIT() does my_init().
storage/maria/ma_write.c:
Logging done by _ma_ck_write_btree_with_log() is moved to a function
(_ma_write_undo_key_insert()), for reusal by R-tree logging.
_ma_log_new() and _ma_log_change() are made non-static for same
reason. Some parameters of logging functions are made pointers to const.
If EXTRA_DEBUG_KEY_CHANGES, we now log CRC in _ma_log_change() too
(better checks, bigger record).
storage/maria/maria_read_log.c:
Program takes no arguments, bail out if any, instead of silently discarding them
storage/myisam/rt_test.c:
rt_test had been forgotten when mi_rkey() was changed some months ago
(0->HA_WHOLE_KEY change).
The 'max_i' change is to make it symmetric with ma_rt_test.c
mysql-test/r/maria-gis-rtree-dynamic.result:
correct result
mysql-test/r/maria-gis-rtree-trans.result:
correct result
mysql-test/r/maria-recovery-rtree-ft.result:
almost correct result (hitting BUG# in the end)
mysql-test/t/maria-gis-rtree-dynamic.test:
test R-tree & dynamic row format
mysql-test/t/maria-gis-rtree-trans.test:
Test R-tree and page row format and transactional
mysql-test/t/maria-recovery-rtree-ft-master.opt:
usual options for recovery testing
mysql-test/t/maria-recovery-rtree-ft.test:
test of recovery of R-tree and fulltext indices.
2008-04-24 17:22:51 +02:00
|
|
|
if ((error=mi_rkey(file,read_record,0,record+1,HA_WHOLE_KEY,
|
|
|
|
HA_READ_MBR_INTERSECT)))
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
printf("mi_rkey: %3d errno: %3d\n",error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
print_record(read_record,mi_position(file)," mi_rkey\n");
|
|
|
|
row_count=1;
|
|
|
|
|
2004-05-16 13:48:32 +02:00
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
if ((error=mi_rnext_same(file,read_record)))
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error==HA_ERR_END_OF_FILE)
|
2002-02-20 11:11:21 +01:00
|
|
|
break;
|
|
|
|
printf("mi_next: %3d errno: %3d\n",error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
print_record(read_record,mi_position(file)," mi_rnext_same\n");
|
|
|
|
row_count++;
|
2004-05-16 13:48:32 +02:00
|
|
|
}
|
2002-02-20 11:11:21 +01:00
|
|
|
printf(" %d rows\n",row_count);
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Test mi_rfirst then a sequence of mi_rnext\n");
|
|
|
|
|
|
|
|
error=mi_rfirst(file,read_record,0);
|
|
|
|
if (error)
|
|
|
|
{
|
|
|
|
printf("mi_rfirst: %3d errno: %3d\n",error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
row_count=1;
|
|
|
|
print_record(read_record,mi_position(file)," mi_frirst\n");
|
|
|
|
|
2004-05-16 13:48:32 +02:00
|
|
|
for (i=0;i<nrecords;i++)
|
|
|
|
{
|
|
|
|
if ((error=mi_rnext(file,read_record,0)))
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error==HA_ERR_END_OF_FILE)
|
2002-02-20 11:11:21 +01:00
|
|
|
break;
|
|
|
|
printf("mi_next: %3d errno: %3d\n",error,my_errno);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
print_record(read_record,mi_position(file)," mi_rnext\n");
|
|
|
|
row_count++;
|
|
|
|
}
|
|
|
|
printf(" %d rows\n",row_count);
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Test mi_records_in_range()\n");
|
|
|
|
|
|
|
|
create_record1(record, nrecords*4/5);
|
|
|
|
print_record(record,0,"\n");
|
2004-05-16 13:48:32 +02:00
|
|
|
|
|
|
|
range.key= record+1;
|
|
|
|
range.length= 1000; /* Big enough */
|
|
|
|
range.flag= HA_READ_MBR_INTERSECT;
|
2020-02-27 18:12:27 +01:00
|
|
|
hrows= mi_records_in_range(file, 0, &range, (key_range*) 0, &pages);
|
2003-04-02 12:06:33 +02:00
|
|
|
printf(" %ld rows\n", (long) hrows);
|
2002-02-20 11:11:21 +01:00
|
|
|
|
|
|
|
if (mi_close(file)) goto err;
|
|
|
|
my_end(MY_CHECK_ERROR);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
printf("got error: %3d when using myisam-database\n",my_errno);
|
2004-02-02 17:25:39 +01:00
|
|
|
return 1; /* skip warning */
|
2002-02-20 11:11:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int read_with_pos (MI_INFO * file,int silent)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
int i;
|
2007-08-13 15:11:25 +02:00
|
|
|
uchar read_record[MAX_REC_LENGTH];
|
2002-02-20 11:11:21 +01:00
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Reading rows with position\n");
|
|
|
|
for (i=0;;i++)
|
|
|
|
{
|
|
|
|
my_errno=0;
|
|
|
|
bzero((char*) read_record,MAX_REC_LENGTH);
|
|
|
|
error=mi_rrnd(file,read_record,i == 0 ? 0L : HA_OFFSET_ERROR);
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error==HA_ERR_END_OF_FILE)
|
2002-02-20 11:11:21 +01:00
|
|
|
break;
|
2004-05-16 13:48:32 +02:00
|
|
|
if (error==HA_ERR_RECORD_DELETED)
|
2002-02-20 11:11:21 +01:00
|
|
|
continue;
|
|
|
|
printf("pos: %2d mi_rrnd: %3d errno: %3d\n",i,error,my_errno);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
print_record(read_record,mi_position(file),"\n");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
static void print_record(uchar * record,
|
2002-10-02 12:33:08 +02:00
|
|
|
my_off_t offs __attribute__((unused)),
|
|
|
|
const char * tail)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
int i;
|
2007-08-13 15:11:25 +02:00
|
|
|
uchar * pos;
|
2002-02-20 11:11:21 +01:00
|
|
|
double c;
|
|
|
|
|
|
|
|
printf(" rec=(%d)",(unsigned char)record[0]);
|
|
|
|
for ( pos=record+1, i=0; i<2*ndims; i++)
|
|
|
|
{
|
|
|
|
memcpy(&c,pos,sizeof(c));
|
|
|
|
float8get(c,pos);
|
|
|
|
printf(" %.14g ",c);
|
|
|
|
pos+=sizeof(c);
|
|
|
|
}
|
|
|
|
printf("pos=%ld",(long int)offs);
|
|
|
|
printf("%s",tail);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
static void create_record1(uchar *record,uint rownr)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
int i;
|
2007-08-13 15:11:25 +02:00
|
|
|
uchar * pos;
|
2002-02-20 11:11:21 +01:00
|
|
|
double c=rownr+10;
|
|
|
|
|
|
|
|
bzero((char*) record,MAX_REC_LENGTH);
|
|
|
|
record[0]=0x01; /* DEL marker */
|
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
for (pos=record+1, i=0; i<2*ndims; i++)
|
2002-02-20 11:11:21 +01:00
|
|
|
{
|
|
|
|
memcpy(pos,&c,sizeof(c));
|
|
|
|
float8store(pos,c);
|
|
|
|
pos+=sizeof(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-20 00:28:42 +02:00
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
static void create_record(uchar *record,uint rownr)
|
2004-06-02 16:11:57 +02:00
|
|
|
{
|
|
|
|
int i;
|
2007-08-13 15:11:25 +02:00
|
|
|
uchar *pos;
|
2004-06-02 16:11:57 +02:00
|
|
|
double *data= rt_data+rownr*4;
|
|
|
|
record[0]=0x01; /* DEL marker */
|
2007-08-13 15:11:25 +02:00
|
|
|
for (pos=record+1, i=0; i<ndims*2; i++)
|
2004-06-02 16:11:57 +02:00
|
|
|
{
|
2007-08-13 15:11:25 +02:00
|
|
|
float8store(pos,data[i]);
|
|
|
|
pos+=8;
|
2004-06-02 16:11:57 +02:00
|
|
|
}
|
|
|
|
}
|
2004-06-02 16:17:35 +02:00
|
|
|
|
2004-03-12 15:51:03 +01:00
|
|
|
#else
|
|
|
|
int main(int argc __attribute__((unused)),char *argv[] __attribute__((unused)))
|
|
|
|
{
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
#endif /*HAVE_RTREE_KEYS*/
|
2009-11-25 13:25:01 +01:00
|
|
|
|
|
|
|
#include "mi_extrafunc.h"
|