2006-04-11 15:45:10 +02:00
|
|
|
/* Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
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 */
|
|
|
|
|
|
|
|
/* Testing of the basic functions of a MARIA table */
|
|
|
|
|
|
|
|
#include "maria.h"
|
|
|
|
#include <my_getopt.h>
|
|
|
|
#include <m_string.h>
|
|
|
|
|
|
|
|
#define MAX_REC_LENGTH 1024
|
|
|
|
|
|
|
|
static void usage();
|
|
|
|
|
|
|
|
static int rec_pointer_size=0, flags[50];
|
|
|
|
static int key_field=FIELD_SKIP_PRESPACE,extra_field=FIELD_SKIP_ENDSPACE;
|
|
|
|
static int key_type=HA_KEYTYPE_NUM;
|
|
|
|
static int create_flag=0;
|
2007-01-18 20:38:14 +01:00
|
|
|
static enum data_file_type record_type= DYNAMIC_RECORD;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
static uint insert_count, update_count, remove_count;
|
|
|
|
static uint pack_keys=0, pack_seg=0, key_length;
|
|
|
|
static uint unique_key=HA_NOSAME;
|
2007-04-04 22:37:09 +02:00
|
|
|
static my_bool pagecacheing, null_fields, silent, skip_update, opt_unique,
|
This patch is a collection of patches from from Sanja, Sergei and Monty.
Added logging and pinning of pages to block format.
Integration of transaction manager, log handler.
Better page cache intergration
Split trnman.h into two files, so that we don't have to include my_atomic.h into C++ programs.
Renaming of structures, more comments, more debugging etc.
Fixed problem with small head block + long varchar.
Added extra argument to delete_record() and update_record() (needed for UNDO logging)
Small changes to interface of pagecache and log handler.
Change initialization of log_record_type_descriptors to not be depending on enum order.
Use array of LEX_STRING's to send data to log handler
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
include/lf.h:
Interface fixes
Rename of structures
(Patch from Sergei via Sanja)
include/my_atomic.h:
More comments
include/my_global.h:
Added MY_ERRPTR
include/pagecache.h:
Added undo LSN when unlocking pages
mysql-test/r/maria.result:
Updated results
mysql-test/t/maria.test:
Added autocommit around lock tables
(Patch from Sanja)
mysys/lf_alloc-pin.c:
Post-review fixes, simple optimizations
More comments
Struct slot renames
Check amount of memory on stack
(Patch from Sergei)
mysys/lf_dynarray.c:
More comments
mysys/lf_hash.c:
More comments
After review fixes
(Patch from Sergei)
storage/maria/ha_maria.cc:
Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
(Temporary fix to avoid bug in gcc)
Move out all deferencing of the transaction structure.
Transaction manager integrated (Patch from Sergei)
storage/maria/ha_maria.h:
Added prototype for start_stmt()
storage/maria/lockman.c:
Function call rename
storage/maria/ma_bitmap.c:
Mark deleted pages free from page cache
storage/maria/ma_blockrec.c:
Offset -> rownr
More debugging
Fixed problem with small head block + long varchar
Added logging of changed pages
Added logging of undo (Including only loggging of changed fields in case of update)
Added pinning/unpinning of all changed pages
More comments
Added free_full_pages() as the same code was used in several places.
fill_rows_parts() renamed as fill_insert_undo_parts()
offset -> rownr
Added some optimization of not transactional tables
_ma_update_block_record() has new parameter, as we need original row to do efficent undo for update
storage/maria/ma_blockrec.h:
Added ROW_EXTENTS_ON_STACK
Changed prototype for update and delete of row
storage/maria/ma_check.c:
Added original row to delete_record() call
storage/maria/ma_control_file.h:
Added ifdefs for C++
storage/maria/ma_delete.c:
Added original row to delete_record() call
(Needed for efficent undo logging)
storage/maria/ma_dynrec.c:
Added extra argument to delete_record() and update_record()
Removed not used variable
storage/maria/ma_init.c:
Initialize log handler
storage/maria/ma_loghandler.c:
Removed not used variable
Change initialization of log_record_type_descriptors to not be depending on enum order
Use array of LEX_STRING's to send data to log handler
storage/maria/ma_loghandler.h:
New defines
Use array of LEX_STRING's to send data to log handler
storage/maria/ma_open.c:
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
Store in MARIA_SHARE->page_type if pages will have up to date LSN's
storage/maria/ma_pagecache.c:
Don't decrease number of readers when using pagecache_write()/pagecache_read()
In pagecache_write() decrement request count if page was left pinned
Added pagecache_delete_pages()
Removed some casts
Make trace output consistent with rest of code
Simplify calling of DBUG_ASSERT(0)
Only update LSN if the LSN is bigger than what's already on the page
Added LSN parameter pagecache_unpin_page(), pagecache_unpin(), and pagecache_unlock()
(Part of patch from Sanja)
storage/maria/ma_static.c:
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
Added default page cache
storage/maria/ma_statrec.c:
Added extra argument to delete_record() and update_record()
storage/maria/ma_test1.c:
Added option -T for transactions
storage/maria/ma_test2.c:
Added option -T for transactions
storage/maria/ma_test_all.sh:
Test with transactions
storage/maria/ma_update.c:
Changed prototype for update of row
storage/maria/maria_def.h:
Changed prototype for update & delete of row as block records need to access the old row
Store in MARIA_SHARE->page_type if pages will have up to date LSN's
Added MARIA_MAX_TREE_LEVELS to allow us to calculate the number of possible pinned pages we may need.
Removed not used 'empty_bits_buffer'
Added pointer to transaction object
Added array for pinned pages
Added log_row_parts array for logging of field data.
Added MARIA_PINNED_PAGE to store pinned pages
storage/maria/trnman.c:
Added accessor functions to transaction object
Added missing DBUG_RETURN()
More debugging
More comments
Changed // comment of code to #ifdef NOT_USED
Transaction manager integrated.
Post review fixes
Part of patch originally from Sergei
storage/maria/trnman.h:
Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
(Temporary fix to avoid bug in gcc)
storage/maria/unittest/ma_pagecache_single.c:
Added missing argument
Added SKIP_BIG_TESTS
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/trnman-t.c:
Stack overflow detection
(Patch from Sergei)
unittest/unit.pl:
Command-line options --big and --verbose
(Patch from Sergei)
unittest/mytap/tap.c:
Detect --big
(Patch from Sergei)
unittest/mytap/tap.h:
Skip_big_tests and SKIP_BIG_TESTS
(Patch from Sergei)
storage/maria/trnman_public.h:
New BitKeeper file ``storage/maria/trnman_public.h''
2007-05-29 19:13:56 +02:00
|
|
|
verbose, skip_delete, transactional;
|
2006-04-11 15:45:10 +02:00
|
|
|
static MARIA_COLUMNDEF recinfo[4];
|
|
|
|
static MARIA_KEYDEF keyinfo[10];
|
|
|
|
static HA_KEYSEG keyseg[10];
|
|
|
|
static HA_KEYSEG uniqueseg[10];
|
|
|
|
|
|
|
|
static int run_test(const char *filename);
|
|
|
|
static void get_options(int argc, char *argv[]);
|
|
|
|
static void create_key(char *key,uint rownr);
|
|
|
|
static void create_record(char *record,uint rownr);
|
|
|
|
static void update_record(char *record);
|
|
|
|
|
|
|
|
int main(int argc,char *argv[])
|
|
|
|
{
|
|
|
|
MY_INIT(argv[0]);
|
|
|
|
my_init();
|
|
|
|
maria_init();
|
|
|
|
get_options(argc,argv);
|
2007-04-19 17:48:36 +02:00
|
|
|
/* Maria requires that we always have a page cache */
|
|
|
|
init_pagecache(maria_pagecache, IO_SIZE*16, 0, 0, maria_block_size);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
exit(run_test("test1"));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int run_test(const char *filename)
|
|
|
|
{
|
|
|
|
MARIA_HA *file;
|
|
|
|
int i,j,error,deleted,rec_length,uniques=0;
|
|
|
|
ha_rows found,row_count;
|
|
|
|
char record[MAX_REC_LENGTH],key[MAX_REC_LENGTH],read_record[MAX_REC_LENGTH];
|
|
|
|
MARIA_UNIQUEDEF uniquedef;
|
|
|
|
MARIA_CREATE_INFO create_info;
|
|
|
|
|
|
|
|
bzero((char*) recinfo,sizeof(recinfo));
|
2007-01-18 20:38:14 +01:00
|
|
|
bzero((char*) &create_info,sizeof(create_info));
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
/* First define 2 columns */
|
2007-01-18 20:38:14 +01:00
|
|
|
create_info.null_bytes= 1;
|
|
|
|
recinfo[0].type= key_field;
|
2007-04-19 12:18:56 +02:00
|
|
|
recinfo[0].length= (key_field == FIELD_BLOB ? 4+portable_sizeof_char_ptr :
|
2006-04-11 15:45:10 +02:00
|
|
|
key_length);
|
|
|
|
if (key_field == FIELD_VARCHAR)
|
2007-01-18 20:38:14 +01:00
|
|
|
recinfo[0].length+= HA_VARCHAR_PACKLENGTH(key_length);
|
|
|
|
recinfo[1].type=extra_field;
|
2007-04-19 12:18:56 +02:00
|
|
|
recinfo[1].length= (extra_field == FIELD_BLOB ? 4 + portable_sizeof_char_ptr : 24);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (extra_field == FIELD_VARCHAR)
|
2007-01-18 20:38:14 +01:00
|
|
|
recinfo[1].length+= HA_VARCHAR_PACKLENGTH(recinfo[1].length);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (opt_unique)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
recinfo[2].type=FIELD_CHECK;
|
|
|
|
recinfo[2].length=MARIA_UNIQUE_HASH_LENGTH;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
rec_length= recinfo[0].length+recinfo[1].length+recinfo[2].length;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if (key_type == HA_KEYTYPE_VARTEXT1 &&
|
|
|
|
key_length > 255)
|
|
|
|
key_type= HA_KEYTYPE_VARTEXT2;
|
|
|
|
|
|
|
|
/* Define a key over the first column */
|
|
|
|
keyinfo[0].seg=keyseg;
|
|
|
|
keyinfo[0].keysegs=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
|
|
|
keyinfo[0].block_length= 0; /* Default block length */
|
2006-04-11 15:45:10 +02:00
|
|
|
keyinfo[0].key_alg=HA_KEY_ALG_BTREE;
|
|
|
|
keyinfo[0].seg[0].type= key_type;
|
|
|
|
keyinfo[0].seg[0].flag= pack_seg;
|
|
|
|
keyinfo[0].seg[0].start=1;
|
|
|
|
keyinfo[0].seg[0].length=key_length;
|
|
|
|
keyinfo[0].seg[0].null_bit= null_fields ? 2 : 0;
|
|
|
|
keyinfo[0].seg[0].null_pos=0;
|
|
|
|
keyinfo[0].seg[0].language= default_charset_info->number;
|
|
|
|
if (pack_seg & HA_BLOB_PART)
|
|
|
|
{
|
|
|
|
keyinfo[0].seg[0].bit_start=4; /* Length of blob length */
|
|
|
|
}
|
|
|
|
keyinfo[0].flag = (uint8) (pack_keys | unique_key);
|
|
|
|
|
|
|
|
bzero((byte*) flags,sizeof(flags));
|
|
|
|
if (opt_unique)
|
|
|
|
{
|
|
|
|
uint start;
|
|
|
|
uniques=1;
|
|
|
|
bzero((char*) &uniquedef,sizeof(uniquedef));
|
|
|
|
bzero((char*) uniqueseg,sizeof(uniqueseg));
|
|
|
|
uniquedef.seg=uniqueseg;
|
|
|
|
uniquedef.keysegs=2;
|
|
|
|
|
|
|
|
/* Make a unique over all columns (except first NULL fields) */
|
|
|
|
for (i=0, start=1 ; i < 2 ; i++)
|
|
|
|
{
|
|
|
|
uniqueseg[i].start=start;
|
2007-01-18 20:38:14 +01:00
|
|
|
start+=recinfo[i].length;
|
|
|
|
uniqueseg[i].length=recinfo[i].length;
|
2006-04-11 15:45:10 +02:00
|
|
|
uniqueseg[i].language= default_charset_info->number;
|
|
|
|
}
|
|
|
|
uniqueseg[0].type= key_type;
|
|
|
|
uniqueseg[0].null_bit= null_fields ? 2 : 0;
|
|
|
|
uniqueseg[1].type= HA_KEYTYPE_TEXT;
|
|
|
|
if (extra_field == FIELD_BLOB)
|
|
|
|
{
|
|
|
|
uniqueseg[1].length=0; /* The whole blob */
|
|
|
|
uniqueseg[1].bit_start=4; /* long blob */
|
|
|
|
uniqueseg[1].flag|= HA_BLOB_PART;
|
|
|
|
}
|
|
|
|
else if (extra_field == FIELD_VARCHAR)
|
2007-01-18 20:38:14 +01:00
|
|
|
{
|
2006-04-11 15:45:10 +02:00
|
|
|
uniqueseg[1].flag|= HA_VAR_LENGTH_PART;
|
2007-01-18 20:38:14 +01:00
|
|
|
uniqueseg[1].type= (HA_VARCHAR_PACKLENGTH(recinfo[1].length-1) == 1 ?
|
|
|
|
HA_KEYTYPE_VARTEXT1 : HA_KEYTYPE_VARTEXT2);
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
uniques=0;
|
|
|
|
|
|
|
|
if (!silent)
|
2007-01-18 20:38:14 +01:00
|
|
|
printf("- Creating maria file\n");
|
2006-04-11 15:45:10 +02:00
|
|
|
create_info.max_rows=(ulong) (rec_pointer_size ?
|
|
|
|
(1L << (rec_pointer_size*8))/40 :
|
|
|
|
0);
|
This patch is a collection of patches from from Sanja, Sergei and Monty.
Added logging and pinning of pages to block format.
Integration of transaction manager, log handler.
Better page cache intergration
Split trnman.h into two files, so that we don't have to include my_atomic.h into C++ programs.
Renaming of structures, more comments, more debugging etc.
Fixed problem with small head block + long varchar.
Added extra argument to delete_record() and update_record() (needed for UNDO logging)
Small changes to interface of pagecache and log handler.
Change initialization of log_record_type_descriptors to not be depending on enum order.
Use array of LEX_STRING's to send data to log handler
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
include/lf.h:
Interface fixes
Rename of structures
(Patch from Sergei via Sanja)
include/my_atomic.h:
More comments
include/my_global.h:
Added MY_ERRPTR
include/pagecache.h:
Added undo LSN when unlocking pages
mysql-test/r/maria.result:
Updated results
mysql-test/t/maria.test:
Added autocommit around lock tables
(Patch from Sanja)
mysys/lf_alloc-pin.c:
Post-review fixes, simple optimizations
More comments
Struct slot renames
Check amount of memory on stack
(Patch from Sergei)
mysys/lf_dynarray.c:
More comments
mysys/lf_hash.c:
More comments
After review fixes
(Patch from Sergei)
storage/maria/ha_maria.cc:
Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
(Temporary fix to avoid bug in gcc)
Move out all deferencing of the transaction structure.
Transaction manager integrated (Patch from Sergei)
storage/maria/ha_maria.h:
Added prototype for start_stmt()
storage/maria/lockman.c:
Function call rename
storage/maria/ma_bitmap.c:
Mark deleted pages free from page cache
storage/maria/ma_blockrec.c:
Offset -> rownr
More debugging
Fixed problem with small head block + long varchar
Added logging of changed pages
Added logging of undo (Including only loggging of changed fields in case of update)
Added pinning/unpinning of all changed pages
More comments
Added free_full_pages() as the same code was used in several places.
fill_rows_parts() renamed as fill_insert_undo_parts()
offset -> rownr
Added some optimization of not transactional tables
_ma_update_block_record() has new parameter, as we need original row to do efficent undo for update
storage/maria/ma_blockrec.h:
Added ROW_EXTENTS_ON_STACK
Changed prototype for update and delete of row
storage/maria/ma_check.c:
Added original row to delete_record() call
storage/maria/ma_control_file.h:
Added ifdefs for C++
storage/maria/ma_delete.c:
Added original row to delete_record() call
(Needed for efficent undo logging)
storage/maria/ma_dynrec.c:
Added extra argument to delete_record() and update_record()
Removed not used variable
storage/maria/ma_init.c:
Initialize log handler
storage/maria/ma_loghandler.c:
Removed not used variable
Change initialization of log_record_type_descriptors to not be depending on enum order
Use array of LEX_STRING's to send data to log handler
storage/maria/ma_loghandler.h:
New defines
Use array of LEX_STRING's to send data to log handler
storage/maria/ma_open.c:
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
Store in MARIA_SHARE->page_type if pages will have up to date LSN's
storage/maria/ma_pagecache.c:
Don't decrease number of readers when using pagecache_write()/pagecache_read()
In pagecache_write() decrement request count if page was left pinned
Added pagecache_delete_pages()
Removed some casts
Make trace output consistent with rest of code
Simplify calling of DBUG_ASSERT(0)
Only update LSN if the LSN is bigger than what's already on the page
Added LSN parameter pagecache_unpin_page(), pagecache_unpin(), and pagecache_unlock()
(Part of patch from Sanja)
storage/maria/ma_static.c:
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
Added default page cache
storage/maria/ma_statrec.c:
Added extra argument to delete_record() and update_record()
storage/maria/ma_test1.c:
Added option -T for transactions
storage/maria/ma_test2.c:
Added option -T for transactions
storage/maria/ma_test_all.sh:
Test with transactions
storage/maria/ma_update.c:
Changed prototype for update of row
storage/maria/maria_def.h:
Changed prototype for update & delete of row as block records need to access the old row
Store in MARIA_SHARE->page_type if pages will have up to date LSN's
Added MARIA_MAX_TREE_LEVELS to allow us to calculate the number of possible pinned pages we may need.
Removed not used 'empty_bits_buffer'
Added pointer to transaction object
Added array for pinned pages
Added log_row_parts array for logging of field data.
Added MARIA_PINNED_PAGE to store pinned pages
storage/maria/trnman.c:
Added accessor functions to transaction object
Added missing DBUG_RETURN()
More debugging
More comments
Changed // comment of code to #ifdef NOT_USED
Transaction manager integrated.
Post review fixes
Part of patch originally from Sergei
storage/maria/trnman.h:
Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
(Temporary fix to avoid bug in gcc)
storage/maria/unittest/ma_pagecache_single.c:
Added missing argument
Added SKIP_BIG_TESTS
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/trnman-t.c:
Stack overflow detection
(Patch from Sergei)
unittest/unit.pl:
Command-line options --big and --verbose
(Patch from Sergei)
unittest/mytap/tap.c:
Detect --big
(Patch from Sergei)
unittest/mytap/tap.h:
Skip_big_tests and SKIP_BIG_TESTS
(Patch from Sergei)
storage/maria/trnman_public.h:
New BitKeeper file ``storage/maria/trnman_public.h''
2007-05-29 19:13:56 +02:00
|
|
|
create_info.transactional= transactional;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_create(filename, record_type, 1, keyinfo,2+opt_unique,recinfo,
|
2006-04-11 15:45:10 +02:00
|
|
|
uniques, &uniquedef, &create_info,
|
|
|
|
create_flag))
|
|
|
|
goto err;
|
|
|
|
if (!(file=maria_open(filename,2,HA_OPEN_ABORT_IF_LOCKED)))
|
|
|
|
goto err;
|
|
|
|
if (!silent)
|
|
|
|
printf("- Writing key:s\n");
|
|
|
|
|
|
|
|
my_errno=0;
|
|
|
|
row_count=deleted=0;
|
|
|
|
for (i=49 ; i>=1 ; i-=2 )
|
|
|
|
{
|
|
|
|
if (insert_count-- == 0) { VOID(maria_close(file)) ; exit(0) ; }
|
|
|
|
j=i%25 +1;
|
|
|
|
create_record(record,j);
|
|
|
|
error=maria_write(file,record);
|
|
|
|
if (!error)
|
|
|
|
row_count++;
|
|
|
|
flags[j]=1;
|
|
|
|
if (verbose || error)
|
|
|
|
printf("J= %2d maria_write: %d errno: %d\n", j,error,my_errno);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Insert 2 rows with null values */
|
|
|
|
if (null_fields)
|
|
|
|
{
|
|
|
|
create_record(record,0);
|
|
|
|
error=maria_write(file,record);
|
|
|
|
if (!error)
|
|
|
|
row_count++;
|
|
|
|
if (verbose || error)
|
|
|
|
printf("J= NULL maria_write: %d errno: %d\n", error,my_errno);
|
|
|
|
error=maria_write(file,record);
|
|
|
|
if (!error)
|
|
|
|
row_count++;
|
|
|
|
if (verbose || error)
|
|
|
|
printf("J= NULL maria_write: %d errno: %d\n", error,my_errno);
|
|
|
|
flags[0]=2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!skip_update)
|
|
|
|
{
|
|
|
|
if (opt_unique)
|
|
|
|
{
|
|
|
|
if (!silent)
|
|
|
|
printf("- Checking unique constraint\n");
|
|
|
|
create_record(record,j);
|
|
|
|
if (!maria_write(file,record) || my_errno != HA_ERR_FOUND_DUPP_UNIQUE)
|
|
|
|
{
|
|
|
|
printf("unique check failed\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!silent)
|
|
|
|
printf("- Updating rows\n");
|
|
|
|
|
|
|
|
/* Update first last row to force extend of file */
|
|
|
|
if (maria_rsame(file,read_record,-1))
|
|
|
|
{
|
|
|
|
printf("Can't find last row with maria_rsame\n");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy(record,read_record,rec_length);
|
|
|
|
update_record(record);
|
|
|
|
if (maria_update(file,read_record,record))
|
|
|
|
{
|
|
|
|
printf("Can't update last row: %.*s\n",
|
|
|
|
keyinfo[0].seg[0].length,read_record+1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read through all rows and update them */
|
2007-01-18 20:38:14 +01:00
|
|
|
assert(maria_scan_init(file) == 0);
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
found=0;
|
2007-01-18 20:38:14 +01:00
|
|
|
while ((error= maria_scan(file,read_record)) == 0)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (update_count-- == 0) { VOID(maria_close(file)) ; exit(0) ; }
|
|
|
|
memcpy(record,read_record,rec_length);
|
|
|
|
update_record(record);
|
|
|
|
if (maria_update(file,read_record,record))
|
|
|
|
{
|
|
|
|
printf("Can't update row: %.*s, error: %d\n",
|
|
|
|
keyinfo[0].seg[0].length,record+1,my_errno);
|
|
|
|
}
|
|
|
|
found++;
|
|
|
|
}
|
|
|
|
if (found != row_count)
|
|
|
|
printf("Found %ld of %ld rows\n", (ulong) found, (ulong) row_count);
|
2007-01-18 20:38:14 +01:00
|
|
|
maria_scan_end(file);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Reopening file\n");
|
|
|
|
if (maria_close(file)) goto err;
|
|
|
|
if (!(file=maria_open(filename,2,HA_OPEN_ABORT_IF_LOCKED))) goto err;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (!skip_delete)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (!silent)
|
|
|
|
printf("- Removing keys\n");
|
|
|
|
|
|
|
|
for (i=0 ; i <= 10 ; i++)
|
|
|
|
{
|
|
|
|
/* testing */
|
2007-01-18 20:38:14 +01:00
|
|
|
if (remove_count-- == 0)
|
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
"delete-rows number of rows deleted; Going down hard!\n");
|
|
|
|
VOID(maria_close(file));
|
|
|
|
exit(0) ;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
j=i*2;
|
|
|
|
if (!flags[j])
|
|
|
|
continue;
|
|
|
|
create_key(key,j);
|
|
|
|
my_errno=0;
|
|
|
|
if ((error = maria_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)))
|
|
|
|
{
|
|
|
|
if (verbose || (flags[j] >= 1 ||
|
|
|
|
(error && my_errno != HA_ERR_KEY_NOT_FOUND)))
|
|
|
|
printf("key: '%.*s' maria_rkey: %3d errno: %3d\n",
|
|
|
|
(int) key_length,key+test(null_fields),error,my_errno);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
error=maria_delete(file,read_record);
|
|
|
|
if (verbose || error)
|
|
|
|
printf("key: '%.*s' maria_delete: %3d errno: %3d\n",
|
|
|
|
(int) key_length, key+test(null_fields), error, my_errno);
|
|
|
|
if (! error)
|
|
|
|
{
|
|
|
|
deleted++;
|
|
|
|
flags[j]--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!silent)
|
|
|
|
printf("- Reading rows with key\n");
|
2007-01-18 20:38:14 +01:00
|
|
|
record[1]= 0; /* For nicer printf */
|
2006-04-11 15:45:10 +02:00
|
|
|
for (i=0 ; i <= 25 ; i++)
|
|
|
|
{
|
|
|
|
create_key(key,i);
|
|
|
|
my_errno=0;
|
|
|
|
error=maria_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT);
|
|
|
|
if (verbose ||
|
|
|
|
(error == 0 && flags[i] == 0 && unique_key) ||
|
|
|
|
(error && (flags[i] != 0 || my_errno != HA_ERR_KEY_NOT_FOUND)))
|
|
|
|
{
|
|
|
|
printf("key: '%.*s' maria_rkey: %3d errno: %3d record: %s\n",
|
|
|
|
(int) key_length,key+test(null_fields),error,my_errno,record+1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Reading rows with position\n");
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_scan_init(file))
|
|
|
|
{
|
|
|
|
fprintf(stderr, "maria_scan_init failed\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
for (i=1,found=0 ; i <= 30 ; i++)
|
|
|
|
{
|
|
|
|
my_errno=0;
|
2007-01-18 20:38:14 +01:00
|
|
|
if ((error= maria_scan(file, read_record)) == HA_ERR_END_OF_FILE)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (found != row_count-deleted)
|
|
|
|
printf("Found only %ld of %ld rows\n", (ulong) found,
|
|
|
|
(ulong) (row_count - deleted));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!error)
|
|
|
|
found++;
|
|
|
|
if (verbose || (error != 0 && error != HA_ERR_RECORD_DELETED &&
|
|
|
|
error != HA_ERR_END_OF_FILE))
|
|
|
|
{
|
|
|
|
printf("pos: %2d maria_rrnd: %3d errno: %3d record: %s\n",
|
|
|
|
i-1,error,my_errno,read_record+1);
|
|
|
|
}
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
if (maria_close(file))
|
|
|
|
goto err;
|
2006-04-11 15:45:10 +02:00
|
|
|
maria_end();
|
|
|
|
my_end(MY_CHECK_ERROR);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
err:
|
|
|
|
printf("got error: %3d when using maria-database\n",my_errno);
|
|
|
|
return 1; /* skip warning */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void create_key_part(char *key,uint rownr)
|
|
|
|
{
|
|
|
|
if (!unique_key)
|
|
|
|
rownr&=7; /* Some identical keys */
|
|
|
|
if (keyinfo[0].seg[0].type == HA_KEYTYPE_NUM)
|
|
|
|
{
|
|
|
|
sprintf(key,"%*d",keyinfo[0].seg[0].length,rownr);
|
|
|
|
}
|
|
|
|
else if (keyinfo[0].seg[0].type == HA_KEYTYPE_VARTEXT1 ||
|
|
|
|
keyinfo[0].seg[0].type == HA_KEYTYPE_VARTEXT2)
|
|
|
|
{ /* Alpha record */
|
|
|
|
/* Create a key that may be easily packed */
|
|
|
|
bfill(key,keyinfo[0].seg[0].length,rownr < 10 ? 'A' : 'B');
|
|
|
|
sprintf(key+keyinfo[0].seg[0].length-2,"%-2d",rownr);
|
|
|
|
if ((rownr & 7) == 0)
|
|
|
|
{
|
|
|
|
/* Change the key to force a unpack of the next key */
|
2007-01-18 20:38:14 +01:00
|
|
|
bfill(key+3,keyinfo[0].seg[0].length-5,rownr < 10 ? 'a' : 'b');
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ /* Alpha record */
|
|
|
|
if (keyinfo[0].seg[0].flag & HA_SPACE_PACK)
|
|
|
|
sprintf(key,"%-*d",keyinfo[0].seg[0].length,rownr);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Create a key that may be easily packed */
|
|
|
|
bfill(key,keyinfo[0].seg[0].length,rownr < 10 ? 'A' : 'B');
|
|
|
|
sprintf(key+keyinfo[0].seg[0].length-2,"%-2d",rownr);
|
|
|
|
if ((rownr & 7) == 0)
|
|
|
|
{
|
|
|
|
/* Change the key to force a unpack of the next key */
|
|
|
|
key[1]= (rownr < 10 ? 'a' : 'b');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void create_key(char *key,uint rownr)
|
|
|
|
{
|
|
|
|
if (keyinfo[0].seg[0].null_bit)
|
|
|
|
{
|
|
|
|
if (rownr == 0)
|
|
|
|
{
|
|
|
|
key[0]=1; /* null key */
|
2007-01-18 20:38:14 +01:00
|
|
|
key[1]=0; /* For easy print of key */
|
2006-04-11 15:45:10 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
*key++=0;
|
|
|
|
}
|
|
|
|
if (keyinfo[0].seg[0].flag & (HA_BLOB_PART | HA_VAR_LENGTH_PART))
|
|
|
|
{
|
|
|
|
uint tmp;
|
|
|
|
create_key_part(key+2,rownr);
|
|
|
|
tmp=strlen(key+2);
|
|
|
|
int2store(key,tmp);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
create_key_part(key,rownr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char blob_key[MAX_REC_LENGTH];
|
|
|
|
static char blob_record[MAX_REC_LENGTH+20*20];
|
|
|
|
|
|
|
|
|
|
|
|
static void create_record(char *record,uint rownr)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
bzero((char*) record,MAX_REC_LENGTH);
|
|
|
|
record[0]=1; /* delete marker */
|
|
|
|
if (rownr == 0 && keyinfo[0].seg[0].null_bit)
|
|
|
|
record[0]|=keyinfo[0].seg[0].null_bit; /* Null key */
|
|
|
|
|
|
|
|
pos=record+1;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (recinfo[0].type == FIELD_BLOB)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint tmp;
|
|
|
|
char *ptr;
|
|
|
|
create_key_part(blob_key,rownr);
|
|
|
|
tmp=strlen(blob_key);
|
|
|
|
int4store(pos,tmp);
|
|
|
|
ptr=blob_key;
|
|
|
|
memcpy_fixed(pos+4,&ptr,sizeof(char*));
|
2007-01-18 20:38:14 +01:00
|
|
|
pos+=recinfo[0].length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
else if (recinfo[0].type == FIELD_VARCHAR)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
uint tmp, pack_length= HA_VARCHAR_PACKLENGTH(recinfo[0].length-1);
|
2006-04-11 15:45:10 +02:00
|
|
|
create_key_part(pos+pack_length,rownr);
|
|
|
|
tmp= strlen(pos+pack_length);
|
|
|
|
if (pack_length == 1)
|
|
|
|
*(uchar*) pos= (uchar) tmp;
|
|
|
|
else
|
|
|
|
int2store(pos,tmp);
|
2007-01-18 20:38:14 +01:00
|
|
|
pos+= recinfo[0].length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
create_key_part(pos,rownr);
|
2007-01-18 20:38:14 +01:00
|
|
|
pos+=recinfo[0].length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
if (recinfo[1].type == FIELD_BLOB)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint tmp;
|
|
|
|
char *ptr;;
|
|
|
|
sprintf(blob_record,"... row: %d", rownr);
|
|
|
|
strappend(blob_record,max(MAX_REC_LENGTH-rownr,10),' ');
|
|
|
|
tmp=strlen(blob_record);
|
|
|
|
int4store(pos,tmp);
|
|
|
|
ptr=blob_record;
|
|
|
|
memcpy_fixed(pos+4,&ptr,sizeof(char*));
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
else if (recinfo[1].type == FIELD_VARCHAR)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint tmp, pack_length= HA_VARCHAR_PACKLENGTH(recinfo[1].length-1);
|
|
|
|
sprintf(pos+pack_length, "... row: %d", rownr);
|
|
|
|
tmp= strlen(pos+pack_length);
|
|
|
|
if (pack_length == 1)
|
|
|
|
*(uchar*) pos= (uchar) tmp;
|
|
|
|
else
|
|
|
|
int2store(pos,tmp);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sprintf(pos,"... row: %d", rownr);
|
2007-01-18 20:38:14 +01:00
|
|
|
strappend(pos,recinfo[1].length,' ');
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* change row to test re-packing of rows and reallocation of keys */
|
|
|
|
|
|
|
|
static void update_record(char *record)
|
|
|
|
{
|
|
|
|
char *pos=record+1;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (recinfo[0].type == FIELD_BLOB)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
char *column,*ptr;
|
|
|
|
int length;
|
|
|
|
length=uint4korr(pos); /* Long blob */
|
|
|
|
memcpy_fixed(&column,pos+4,sizeof(char*));
|
|
|
|
memcpy(blob_key,column,length); /* Move old key */
|
|
|
|
ptr=blob_key;
|
|
|
|
memcpy_fixed(pos+4,&ptr,sizeof(char*)); /* Store pointer to new key */
|
|
|
|
if (keyinfo[0].seg[0].type != HA_KEYTYPE_NUM)
|
|
|
|
default_charset_info->cset->casedn(default_charset_info,
|
|
|
|
blob_key, length, blob_key, length);
|
2007-01-18 20:38:14 +01:00
|
|
|
pos+=recinfo[0].length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
else if (recinfo[0].type == FIELD_VARCHAR)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
uint pack_length= HA_VARCHAR_PACKLENGTH(recinfo[0].length-1);
|
2006-04-11 15:45:10 +02:00
|
|
|
uint length= pack_length == 1 ? (uint) *(uchar*) pos : uint2korr(pos);
|
|
|
|
default_charset_info->cset->casedn(default_charset_info,
|
|
|
|
pos + pack_length, length,
|
|
|
|
pos + pack_length, length);
|
2007-01-18 20:38:14 +01:00
|
|
|
pos+=recinfo[0].length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (keyinfo[0].seg[0].type != HA_KEYTYPE_NUM)
|
|
|
|
default_charset_info->cset->casedn(default_charset_info,
|
|
|
|
pos, keyinfo[0].seg[0].length,
|
|
|
|
pos, keyinfo[0].seg[0].length);
|
2007-01-18 20:38:14 +01:00
|
|
|
pos+=recinfo[0].length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
if (recinfo[1].type == FIELD_BLOB)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
char *column;
|
|
|
|
int length;
|
|
|
|
length=uint4korr(pos);
|
|
|
|
memcpy_fixed(&column,pos+4,sizeof(char*));
|
|
|
|
memcpy(blob_record,column,length);
|
|
|
|
bfill(blob_record+length,20,'.'); /* Make it larger */
|
|
|
|
length+=20;
|
|
|
|
int4store(pos,length);
|
|
|
|
column=blob_record;
|
|
|
|
memcpy_fixed(pos+4,&column,sizeof(char*));
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
else if (recinfo[1].type == FIELD_VARCHAR)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
/* Second field is longer than 10 characters */
|
|
|
|
uint pack_length= HA_VARCHAR_PACKLENGTH(recinfo[1].length-1);
|
|
|
|
uint length= pack_length == 1 ? (uint) *(uchar*) pos : uint2korr(pos);
|
2007-01-18 20:38:14 +01:00
|
|
|
pos= record+ recinfo[1].offset;
|
|
|
|
bfill(pos+pack_length+length,recinfo[1].length-length-pack_length,'.');
|
|
|
|
length=recinfo[1].length-pack_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
if (pack_length == 1)
|
|
|
|
*(uchar*) pos= (uchar) length;
|
|
|
|
else
|
|
|
|
int2store(pos,length);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
bfill(pos+recinfo[1].length-10,10,'.');
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct my_option my_long_options[] =
|
|
|
|
{
|
|
|
|
{"checksum", 'c', "Undocumented",
|
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
{"debug", '#', "Undocumented",
|
|
|
|
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
|
|
#endif
|
2007-01-18 20:38:14 +01:00
|
|
|
{"delete-rows", 'd', "Abort after this many rows has been deleted",
|
|
|
|
(gptr*) &remove_count, (gptr*) &remove_count, 0, GET_UINT, REQUIRED_ARG,
|
|
|
|
1000, 0, 0, 0, 0, 0},
|
2006-04-11 15:45:10 +02:00
|
|
|
{"help", '?', "Display help and exit",
|
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"insert-rows", 'i', "Undocumented", (gptr*) &insert_count,
|
2006-04-11 15:45:10 +02:00
|
|
|
(gptr*) &insert_count, 0, GET_UINT, REQUIRED_ARG, 1000, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"key-alpha", 'a', "Use a key of type HA_KEYTYPE_TEXT",
|
2006-04-11 15:45:10 +02:00
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"key-binary-pack", 'B', "Undocumented",
|
2006-04-11 15:45:10 +02:00
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"key-blob", 'b', "Undocumented",
|
2006-04-11 15:45:10 +02:00
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-04-04 22:37:09 +02:00
|
|
|
{"key-cache", 'K', "Undocumented", (gptr*) &pagecacheing,
|
|
|
|
(gptr*) &pagecacheing, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"key-length", 'k', "Undocumented", (gptr*) &key_length, (gptr*) &key_length,
|
2006-04-11 15:45:10 +02:00
|
|
|
0, GET_UINT, REQUIRED_ARG, 6, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"key-multiple", 'm', "Undocumented",
|
2006-04-11 15:45:10 +02:00
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"key-prefix_pack", 'P', "Undocumented",
|
2006-04-11 15:45:10 +02:00
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"key-space_pack", 'p', "Undocumented",
|
2006-04-11 15:45:10 +02:00
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"key-varchar", 'w', "Test VARCHAR keys",
|
2006-04-11 15:45:10 +02:00
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"null-fields", 'N', "Define fields with NULL",
|
2006-04-11 15:45:10 +02:00
|
|
|
(gptr*) &null_fields, (gptr*) &null_fields, 0, GET_BOOL, NO_ARG,
|
|
|
|
0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"row-fixed-size", 'S', "Fixed size records",
|
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
|
|
{"rows-in-block", 'M', "Store rows in block format",
|
2006-04-11 15:45:10 +02:00
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"row-pointer-size", 'R', "Undocumented", (gptr*) &rec_pointer_size,
|
2006-04-11 15:45:10 +02:00
|
|
|
(gptr*) &rec_pointer_size, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
|
|
{"silent", 's', "Undocumented",
|
|
|
|
(gptr*) &silent, (gptr*) &silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"skip-delete", 'U', "Don't test deletes", (gptr*) &skip_delete,
|
|
|
|
(gptr*) &skip_delete, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
|
|
{"skip-update", 'D', "Don't test updates", (gptr*) &skip_update,
|
2006-04-11 15:45:10 +02:00
|
|
|
(gptr*) &skip_update, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
This patch is a collection of patches from from Sanja, Sergei and Monty.
Added logging and pinning of pages to block format.
Integration of transaction manager, log handler.
Better page cache intergration
Split trnman.h into two files, so that we don't have to include my_atomic.h into C++ programs.
Renaming of structures, more comments, more debugging etc.
Fixed problem with small head block + long varchar.
Added extra argument to delete_record() and update_record() (needed for UNDO logging)
Small changes to interface of pagecache and log handler.
Change initialization of log_record_type_descriptors to not be depending on enum order.
Use array of LEX_STRING's to send data to log handler
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
include/lf.h:
Interface fixes
Rename of structures
(Patch from Sergei via Sanja)
include/my_atomic.h:
More comments
include/my_global.h:
Added MY_ERRPTR
include/pagecache.h:
Added undo LSN when unlocking pages
mysql-test/r/maria.result:
Updated results
mysql-test/t/maria.test:
Added autocommit around lock tables
(Patch from Sanja)
mysys/lf_alloc-pin.c:
Post-review fixes, simple optimizations
More comments
Struct slot renames
Check amount of memory on stack
(Patch from Sergei)
mysys/lf_dynarray.c:
More comments
mysys/lf_hash.c:
More comments
After review fixes
(Patch from Sergei)
storage/maria/ha_maria.cc:
Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
(Temporary fix to avoid bug in gcc)
Move out all deferencing of the transaction structure.
Transaction manager integrated (Patch from Sergei)
storage/maria/ha_maria.h:
Added prototype for start_stmt()
storage/maria/lockman.c:
Function call rename
storage/maria/ma_bitmap.c:
Mark deleted pages free from page cache
storage/maria/ma_blockrec.c:
Offset -> rownr
More debugging
Fixed problem with small head block + long varchar
Added logging of changed pages
Added logging of undo (Including only loggging of changed fields in case of update)
Added pinning/unpinning of all changed pages
More comments
Added free_full_pages() as the same code was used in several places.
fill_rows_parts() renamed as fill_insert_undo_parts()
offset -> rownr
Added some optimization of not transactional tables
_ma_update_block_record() has new parameter, as we need original row to do efficent undo for update
storage/maria/ma_blockrec.h:
Added ROW_EXTENTS_ON_STACK
Changed prototype for update and delete of row
storage/maria/ma_check.c:
Added original row to delete_record() call
storage/maria/ma_control_file.h:
Added ifdefs for C++
storage/maria/ma_delete.c:
Added original row to delete_record() call
(Needed for efficent undo logging)
storage/maria/ma_dynrec.c:
Added extra argument to delete_record() and update_record()
Removed not used variable
storage/maria/ma_init.c:
Initialize log handler
storage/maria/ma_loghandler.c:
Removed not used variable
Change initialization of log_record_type_descriptors to not be depending on enum order
Use array of LEX_STRING's to send data to log handler
storage/maria/ma_loghandler.h:
New defines
Use array of LEX_STRING's to send data to log handler
storage/maria/ma_open.c:
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
Store in MARIA_SHARE->page_type if pages will have up to date LSN's
storage/maria/ma_pagecache.c:
Don't decrease number of readers when using pagecache_write()/pagecache_read()
In pagecache_write() decrement request count if page was left pinned
Added pagecache_delete_pages()
Removed some casts
Make trace output consistent with rest of code
Simplify calling of DBUG_ASSERT(0)
Only update LSN if the LSN is bigger than what's already on the page
Added LSN parameter pagecache_unpin_page(), pagecache_unpin(), and pagecache_unlock()
(Part of patch from Sanja)
storage/maria/ma_static.c:
Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
Added default page cache
storage/maria/ma_statrec.c:
Added extra argument to delete_record() and update_record()
storage/maria/ma_test1.c:
Added option -T for transactions
storage/maria/ma_test2.c:
Added option -T for transactions
storage/maria/ma_test_all.sh:
Test with transactions
storage/maria/ma_update.c:
Changed prototype for update of row
storage/maria/maria_def.h:
Changed prototype for update & delete of row as block records need to access the old row
Store in MARIA_SHARE->page_type if pages will have up to date LSN's
Added MARIA_MAX_TREE_LEVELS to allow us to calculate the number of possible pinned pages we may need.
Removed not used 'empty_bits_buffer'
Added pointer to transaction object
Added array for pinned pages
Added log_row_parts array for logging of field data.
Added MARIA_PINNED_PAGE to store pinned pages
storage/maria/trnman.c:
Added accessor functions to transaction object
Added missing DBUG_RETURN()
More debugging
More comments
Changed // comment of code to #ifdef NOT_USED
Transaction manager integrated.
Post review fixes
Part of patch originally from Sergei
storage/maria/trnman.h:
Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
(Temporary fix to avoid bug in gcc)
storage/maria/unittest/ma_pagecache_single.c:
Added missing argument
Added SKIP_BIG_TESTS
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
Test logging with new LEX_STRING parameter
(Patch from Sanja)
storage/maria/unittest/trnman-t.c:
Stack overflow detection
(Patch from Sergei)
unittest/unit.pl:
Command-line options --big and --verbose
(Patch from Sergei)
unittest/mytap/tap.c:
Detect --big
(Patch from Sergei)
unittest/mytap/tap.h:
Skip_big_tests and SKIP_BIG_TESTS
(Patch from Sergei)
storage/maria/trnman_public.h:
New BitKeeper file ``storage/maria/trnman_public.h''
2007-05-29 19:13:56 +02:00
|
|
|
{"transactional", 'T', "Test in transactional mode. (Only works with block format)",
|
|
|
|
(gptr*) &transactional, (gptr*) &transactional, 0, GET_BOOL, NO_ARG,
|
|
|
|
0, 0, 0, 0, 0, 0},
|
2006-04-11 15:45:10 +02:00
|
|
|
{"unique", 'C', "Undocumented", (gptr*) &opt_unique, (gptr*) &opt_unique, 0,
|
|
|
|
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2007-01-18 20:38:14 +01:00
|
|
|
{"update-rows", 'u', "Undocumented", (gptr*) &update_count,
|
2006-04-11 15:45:10 +02:00
|
|
|
(gptr*) &update_count, 0, GET_UINT, REQUIRED_ARG, 1000, 0, 0, 0, 0, 0},
|
|
|
|
{"verbose", 'v', "Be more verbose", (gptr*) &verbose, (gptr*) &verbose, 0,
|
|
|
|
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
|
|
{"version", 'V', "Print version number and exit",
|
|
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
|
|
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static my_bool
|
|
|
|
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|
|
|
char *argument)
|
|
|
|
{
|
|
|
|
switch(optid) {
|
|
|
|
case 'a':
|
|
|
|
key_type= HA_KEYTYPE_TEXT;
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
create_flag|= HA_CREATE_CHECKSUM;
|
|
|
|
break;
|
|
|
|
case 'R': /* Length of record pointer */
|
|
|
|
if (rec_pointer_size > 3)
|
|
|
|
rec_pointer_size=0;
|
|
|
|
break;
|
|
|
|
case 'P':
|
|
|
|
pack_keys= HA_PACK_KEY; /* Use prefix compression */
|
|
|
|
break;
|
|
|
|
case 'B':
|
|
|
|
pack_keys= HA_BINARY_PACK_KEY; /* Use binary compression */
|
|
|
|
break;
|
2007-01-18 20:38:14 +01:00
|
|
|
case 'M':
|
|
|
|
record_type= BLOCK_RECORD;
|
|
|
|
break;
|
2006-04-11 15:45:10 +02:00
|
|
|
case 'S':
|
|
|
|
if (key_field == FIELD_VARCHAR)
|
|
|
|
{
|
|
|
|
create_flag=0; /* Static sized varchar */
|
2007-01-18 20:38:14 +01:00
|
|
|
record_type= STATIC_RECORD;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else if (key_field != FIELD_BLOB)
|
|
|
|
{
|
|
|
|
key_field=FIELD_NORMAL; /* static-size record */
|
|
|
|
extra_field=FIELD_NORMAL;
|
2007-01-18 20:38:14 +01:00
|
|
|
record_type= STATIC_RECORD;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'p':
|
|
|
|
pack_keys=HA_PACK_KEY; /* Use prefix + space packing */
|
|
|
|
pack_seg=HA_SPACE_PACK;
|
|
|
|
key_type=HA_KEYTYPE_TEXT;
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
unique_key=0;
|
|
|
|
break;
|
|
|
|
case 'b':
|
|
|
|
key_field=FIELD_BLOB; /* blob key */
|
|
|
|
extra_field= FIELD_BLOB;
|
|
|
|
pack_seg|= HA_BLOB_PART;
|
|
|
|
key_type= HA_KEYTYPE_VARTEXT1;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (record_type == STATIC_RECORD)
|
|
|
|
record_type= DYNAMIC_RECORD;
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
case 'k':
|
|
|
|
if (key_length < 4 || key_length > HA_MAX_KEY_LENGTH)
|
|
|
|
{
|
|
|
|
fprintf(stderr,"Wrong key length\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
key_field=FIELD_VARCHAR; /* varchar keys */
|
|
|
|
extra_field= FIELD_VARCHAR;
|
|
|
|
key_type= HA_KEYTYPE_VARTEXT1;
|
|
|
|
pack_seg|= HA_VAR_LENGTH_PART;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (record_type == STATIC_RECORD)
|
|
|
|
record_type= DYNAMIC_RECORD;
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
case 'K': /* Use key cacheing */
|
2007-04-04 22:37:09 +02:00
|
|
|
pagecacheing=1;
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
case 'V':
|
|
|
|
printf("test1 Ver 1.2 \n");
|
|
|
|
exit(0);
|
|
|
|
case '#':
|
|
|
|
DBUG_PUSH (argument);
|
|
|
|
break;
|
|
|
|
case '?':
|
|
|
|
usage();
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Read options */
|
|
|
|
|
|
|
|
static void get_options(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int ho_error;
|
|
|
|
|
|
|
|
if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
|
|
|
|
exit(ho_error);
|
|
|
|
|
|
|
|
return;
|
|
|
|
} /* get options */
|
|
|
|
|
|
|
|
|
|
|
|
static void usage()
|
|
|
|
{
|
|
|
|
printf("Usage: %s [options]\n\n", my_progname);
|
|
|
|
my_print_help(my_long_options);
|
|
|
|
my_print_variables(my_long_options);
|
|
|
|
}
|