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 */
|
|
|
|
|
|
|
|
/* Test av isam-databas: stor test */
|
|
|
|
|
|
|
|
#ifndef USE_MY_FUNC /* We want to be able to dbug this !! */
|
|
|
|
#define USE_MY_FUNC
|
|
|
|
#endif
|
|
|
|
#ifdef DBUG_OFF
|
|
|
|
#undef DBUG_OFF
|
|
|
|
#endif
|
|
|
|
#ifndef SAFEMALLOC
|
|
|
|
#define SAFEMALLOC
|
|
|
|
#endif
|
|
|
|
#include "maria_def.h"
|
|
|
|
#include <m_ctype.h>
|
2006-08-11 01:16:51 +02:00
|
|
|
#include <my_bit.h>
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-06-04 13:07:18 +02:00
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
#define STANDARD_LENGTH 37
|
|
|
|
#define MARIA_KEYS 6
|
|
|
|
#define MAX_PARTS 4
|
|
|
|
#if !defined(MSDOS) && !defined(labs)
|
|
|
|
#define labs(a) abs(a)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void get_options(int argc, char *argv[]);
|
|
|
|
static uint rnd(uint max_value);
|
|
|
|
static void fix_length(byte *record,uint length);
|
2007-01-18 20:38:14 +01:00
|
|
|
static void put_blob_in_record(char *blob_pos,char **blob_buffer,
|
|
|
|
ulong *length);
|
2006-04-11 15:45:10 +02:00
|
|
|
static void copy_key(struct st_maria_info *info,uint inx,
|
|
|
|
uchar *record,uchar *key);
|
|
|
|
|
|
|
|
static int verbose=0,testflag=0,
|
2007-04-04 22:37:09 +02:00
|
|
|
first_key=0,async_io=0,pagecacheing=0,write_cacheing=0,locking=0,
|
2006-05-05 20:32:02 +02:00
|
|
|
rec_pointer_size=0,pack_fields=1,silent=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
|
|
|
opt_quick_mode=0, transactional= 0;
|
2007-01-18 20:38:14 +01:00
|
|
|
static int pack_seg=HA_SPACE_PACK,pack_type=HA_PACK_KEY,remove_count=-1;
|
|
|
|
static int create_flag= 0, srand_arg= 0;
|
2007-04-04 22:37:09 +02:00
|
|
|
static ulong pagecache_size=IO_SIZE*16;
|
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 keys=MARIA_KEYS,recant=1000;
|
|
|
|
static uint use_blob=0;
|
|
|
|
static uint16 key1[1001],key3[5000];
|
|
|
|
static char record[300],record2[300],key[100],key2[100],
|
|
|
|
read_record[300],read_record2[300],read_record3[300];
|
|
|
|
static HA_KEYSEG glob_keyseg[MARIA_KEYS][MAX_PARTS];
|
|
|
|
|
|
|
|
/* Test program */
|
|
|
|
|
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
uint i;
|
|
|
|
int j,n1,n2,n3,error,k;
|
|
|
|
uint write_count,update,dupp_keys,opt_delete,start,length,blob_pos,
|
|
|
|
reclength,ant,found_parts;
|
|
|
|
my_off_t lastpos;
|
|
|
|
ha_rows range_records,records;
|
|
|
|
MARIA_HA *file;
|
|
|
|
MARIA_KEYDEF keyinfo[10];
|
|
|
|
MARIA_COLUMNDEF recinfo[10];
|
|
|
|
MARIA_INFO info;
|
|
|
|
const char *filename;
|
|
|
|
char *blob_buffer;
|
|
|
|
MARIA_CREATE_INFO create_info;
|
|
|
|
MY_INIT(argv[0]);
|
|
|
|
|
|
|
|
filename= "test2";
|
|
|
|
get_options(argc,argv);
|
|
|
|
if (! async_io)
|
|
|
|
my_disable_async_io=1;
|
|
|
|
|
|
|
|
maria_init();
|
|
|
|
reclength=STANDARD_LENGTH+60+(use_blob ? 8 : 0);
|
|
|
|
blob_pos=STANDARD_LENGTH+60;
|
|
|
|
keyinfo[0].seg= &glob_keyseg[0][0];
|
|
|
|
keyinfo[0].seg[0].start=0;
|
|
|
|
keyinfo[0].seg[0].length=6;
|
|
|
|
keyinfo[0].seg[0].type=HA_KEYTYPE_TEXT;
|
|
|
|
keyinfo[0].seg[0].language= default_charset_info->number;
|
|
|
|
keyinfo[0].seg[0].flag=(uint8) pack_seg;
|
|
|
|
keyinfo[0].seg[0].null_bit=0;
|
|
|
|
keyinfo[0].seg[0].null_pos=0;
|
|
|
|
keyinfo[0].key_alg=HA_KEY_ALG_BTREE;
|
|
|
|
keyinfo[0].keysegs=1;
|
|
|
|
keyinfo[0].flag = pack_type;
|
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[1].seg= &glob_keyseg[1][0];
|
|
|
|
keyinfo[1].seg[0].start=7;
|
|
|
|
keyinfo[1].seg[0].length=6;
|
|
|
|
keyinfo[1].seg[0].type=HA_KEYTYPE_BINARY;
|
|
|
|
keyinfo[1].seg[0].flag=0;
|
|
|
|
keyinfo[1].seg[0].null_bit=0;
|
|
|
|
keyinfo[1].seg[0].null_pos=0;
|
|
|
|
keyinfo[1].seg[1].start=0; /* two part key */
|
|
|
|
keyinfo[1].seg[1].length=6;
|
|
|
|
keyinfo[1].seg[1].type=HA_KEYTYPE_NUM;
|
|
|
|
keyinfo[1].seg[1].flag=HA_REVERSE_SORT;
|
|
|
|
keyinfo[1].seg[1].null_bit=0;
|
|
|
|
keyinfo[1].seg[1].null_pos=0;
|
|
|
|
keyinfo[1].key_alg=HA_KEY_ALG_BTREE;
|
|
|
|
keyinfo[1].keysegs=2;
|
|
|
|
keyinfo[1].flag =0;
|
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[1].block_length= MARIA_MIN_KEY_BLOCK_LENGTH; /* Diff blocklength */
|
2006-04-11 15:45:10 +02:00
|
|
|
keyinfo[2].seg= &glob_keyseg[2][0];
|
|
|
|
keyinfo[2].seg[0].start=12;
|
|
|
|
keyinfo[2].seg[0].length=8;
|
|
|
|
keyinfo[2].seg[0].type=HA_KEYTYPE_BINARY;
|
|
|
|
keyinfo[2].seg[0].flag=HA_REVERSE_SORT;
|
|
|
|
keyinfo[2].seg[0].null_bit=0;
|
|
|
|
keyinfo[2].seg[0].null_pos=0;
|
|
|
|
keyinfo[2].key_alg=HA_KEY_ALG_BTREE;
|
|
|
|
keyinfo[2].keysegs=1;
|
|
|
|
keyinfo[2].flag =HA_NOSAME;
|
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[2].block_length= 0; /* Default block length */
|
2006-04-11 15:45:10 +02:00
|
|
|
keyinfo[3].seg= &glob_keyseg[3][0];
|
|
|
|
keyinfo[3].seg[0].start=0;
|
|
|
|
keyinfo[3].seg[0].length=reclength-(use_blob ? 8 : 0);
|
|
|
|
keyinfo[3].seg[0].type=HA_KEYTYPE_TEXT;
|
|
|
|
keyinfo[3].seg[0].language=default_charset_info->number;
|
|
|
|
keyinfo[3].seg[0].flag=(uint8) pack_seg;
|
|
|
|
keyinfo[3].seg[0].null_bit=0;
|
|
|
|
keyinfo[3].seg[0].null_pos=0;
|
|
|
|
keyinfo[3].key_alg=HA_KEY_ALG_BTREE;
|
|
|
|
keyinfo[3].keysegs=1;
|
|
|
|
keyinfo[3].flag = pack_type;
|
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[3].block_length= 0; /* Default block length */
|
2006-04-11 15:45:10 +02:00
|
|
|
keyinfo[4].seg= &glob_keyseg[4][0];
|
|
|
|
keyinfo[4].seg[0].start=0;
|
|
|
|
keyinfo[4].seg[0].length=5;
|
|
|
|
keyinfo[4].seg[0].type=HA_KEYTYPE_TEXT;
|
|
|
|
keyinfo[4].seg[0].language=default_charset_info->number;
|
|
|
|
keyinfo[4].seg[0].flag=0;
|
|
|
|
keyinfo[4].seg[0].null_bit=0;
|
|
|
|
keyinfo[4].seg[0].null_pos=0;
|
|
|
|
keyinfo[4].key_alg=HA_KEY_ALG_BTREE;
|
|
|
|
keyinfo[4].keysegs=1;
|
|
|
|
keyinfo[4].flag = pack_type;
|
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[4].block_length= 0; /* Default block length */
|
2006-04-11 15:45:10 +02:00
|
|
|
keyinfo[5].seg= &glob_keyseg[5][0];
|
|
|
|
keyinfo[5].seg[0].start=0;
|
|
|
|
keyinfo[5].seg[0].length=4;
|
|
|
|
keyinfo[5].seg[0].type=HA_KEYTYPE_TEXT;
|
|
|
|
keyinfo[5].seg[0].language=default_charset_info->number;
|
|
|
|
keyinfo[5].seg[0].flag=pack_seg;
|
|
|
|
keyinfo[5].seg[0].null_bit=0;
|
|
|
|
keyinfo[5].seg[0].null_pos=0;
|
|
|
|
keyinfo[5].key_alg=HA_KEY_ALG_BTREE;
|
|
|
|
keyinfo[5].keysegs=1;
|
|
|
|
keyinfo[5].flag = pack_type;
|
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[5].block_length= 0; /* Default block length */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
recinfo[0].type=pack_fields ? FIELD_SKIP_PRESPACE : 0;
|
|
|
|
recinfo[0].length=7;
|
|
|
|
recinfo[0].null_bit=0;
|
|
|
|
recinfo[0].null_pos=0;
|
|
|
|
recinfo[1].type=pack_fields ? FIELD_SKIP_PRESPACE : 0;
|
|
|
|
recinfo[1].length=5;
|
|
|
|
recinfo[1].null_bit=0;
|
|
|
|
recinfo[1].null_pos=0;
|
|
|
|
recinfo[2].type=pack_fields ? FIELD_SKIP_PRESPACE : 0;
|
|
|
|
recinfo[2].length=9;
|
|
|
|
recinfo[2].null_bit=0;
|
|
|
|
recinfo[2].null_pos=0;
|
|
|
|
recinfo[3].type=FIELD_NORMAL;
|
|
|
|
recinfo[3].length=STANDARD_LENGTH-7-5-9-4;
|
|
|
|
recinfo[3].null_bit=0;
|
|
|
|
recinfo[3].null_pos=0;
|
|
|
|
recinfo[4].type=pack_fields ? FIELD_SKIP_ZERO : 0;
|
|
|
|
recinfo[4].length=4;
|
|
|
|
recinfo[4].null_bit=0;
|
|
|
|
recinfo[4].null_pos=0;
|
|
|
|
recinfo[5].type=pack_fields ? FIELD_SKIP_ENDSPACE : 0;
|
|
|
|
recinfo[5].length=60;
|
|
|
|
recinfo[5].null_bit=0;
|
|
|
|
recinfo[5].null_pos=0;
|
|
|
|
if (use_blob)
|
|
|
|
{
|
|
|
|
recinfo[6].type=FIELD_BLOB;
|
2007-04-19 12:18:56 +02:00
|
|
|
recinfo[6].length=4+portable_sizeof_char_ptr;
|
2006-04-11 15:45:10 +02:00
|
|
|
recinfo[6].null_bit=0;
|
|
|
|
recinfo[6].null_pos=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
write_count=update=dupp_keys=opt_delete=0;
|
|
|
|
blob_buffer=0;
|
|
|
|
|
|
|
|
for (i=1000 ; i>0 ; i--) key1[i]=0;
|
|
|
|
for (i=4999 ; i>0 ; i--) key3[i]=0;
|
|
|
|
|
|
|
|
if (!silent)
|
2007-01-18 20:38:14 +01:00
|
|
|
printf("- Creating maria-file\n");
|
2006-04-11 15:45:10 +02:00
|
|
|
file= 0;
|
|
|
|
bzero((char*) &create_info,sizeof(create_info));
|
|
|
|
create_info.max_rows=(ha_rows) (rec_pointer_size ?
|
|
|
|
(1L << (rec_pointer_size*8))/
|
|
|
|
reclength : 0);
|
|
|
|
create_info.reloc_rows=(ha_rows) 100;
|
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, keys,&keyinfo[first_key],
|
2006-04-11 15:45:10 +02:00
|
|
|
use_blob ? 7 : 6, &recinfo[0],
|
|
|
|
0,(MARIA_UNIQUEDEF*) 0,
|
|
|
|
&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");
|
2007-06-04 13:07:18 +02:00
|
|
|
maria_data_root= ".";
|
2007-04-19 17:48:36 +02:00
|
|
|
/* Maria requires that we always have a page cache */
|
2007-06-04 13:07:18 +02:00
|
|
|
if ((init_pagecache(maria_pagecache, pagecache_size, 0, 0,
|
|
|
|
maria_block_size) == 0) ||
|
WL#3072 Maria Recovery
- new program maria_read_log to display and apply log records
found in a Maria log (see file's revision comment)
- minor, misc fixes
storage/maria/Makefile.am:
new program maria_read_log
storage/maria/ha_maria.cc:
create control file if missing
storage/maria/ma_blockrec.c:
0 -> LSN_IMPOSSIBLE; comments
storage/maria/ma_checkpoint.h:
preparations for Checkpoint module
storage/maria/ma_close.c:
comment
storage/maria/ma_control_file.c:
renaming constants.
Possibility to say "open control file but don't create it if it's
missing" (used by maria_read_log which does not want to create
anything)
storage/maria/ma_control_file.h:
renaming constants
storage/maria/ma_create.c:
I had duplicated "linkname" and "linkname_ptr", now I see it's not
needed, reverting. Indeed those variables don't contain interesting
information; fixing log record accordingly (the links are in
ci->data/index_file_name). Storing keystart in log record is needed,
to know at which size we must extend the file if we replay
LOGREC_CREATE_TABLE.
storage/maria/ma_loghandler.c:
some structures need to be known to maria_read_log.c, taking
them to ma_loghandler.h
storage/maria/ma_loghandler.h:
we have page_store, adding page_korr.
translog_lock() made public, because Checkpoint will need it (to
write to control file).
Some structures moved from ma_loghandler.c because maria_read_log.c
needs them (needs to know the execute-in-REDO-phase hooks of each
record).
storage/maria/ma_loghandler_lsn.h:
constants defined in ma_control_file.h serve everywhere,
and they relate to LSNs, so putting them in ma_loghandler_lsn.h.
Stronger constraints in LSN_VALID().
storage/maria/ma_pagecache.c:
renaming constants
storage/maria/ma_recovery.h:
copyright
storage/maria/ma_test1.c:
new prototype
storage/maria/ma_test2.c:
new prototype
storage/maria/trnman_public.h:
double-inclusion safe
storage/maria/unittest/ma_control_file-t.c:
constants renamed, new prototype
storage/maria/unittest/ma_test_loghandler-t.c:
constants renamed, new prototype
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
constants renamed, new prototype
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
constants renamed, new prototype
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
constants renamed, new prototype
storage/myisam/mi_close.c:
comment
storage/maria/maria_read_log.c:
program to read and print log records from a Maria transaction log,
and optionally apply them to tables. Very basic, early version.
Should serve as a base for Recovery's code. Designed to be idempotent.
Create a log by running maria.test, then cd to var/master-data
and run "maria_read_log --only-display" to see info about records;
run "maria_read_log --display-and-apply" to also apply the records
to tables (it's more interesting if you first wipe out the
tables in var/master-data/test, to see how they get re-created).
Only a few records are handled by now: LONG_TRANSACTION_ID,
COMMIT, FILE_ID, REDO_CREATE_TABLE; place is ready for
REDO_INSERT_ROW_HEAD where I could use Monty's help (search for
"Monty" in the file). Note: changes to the index pages, index's header
and bitmap pages are not properly logged yet, so don't expect
the program to work with that.
2007-06-26 16:49:23 +02:00
|
|
|
ma_control_file_create_or_open(TRUE) ||
|
2007-06-04 13:07:18 +02:00
|
|
|
(init_pagecache(maria_log_pagecache,
|
|
|
|
TRANSLOG_PAGECACHE_SIZE, 0, 0,
|
|
|
|
TRANSLOG_PAGE_SIZE) == 0) ||
|
|
|
|
translog_init(maria_data_root, TRANSLOG_FILE_SIZE,
|
|
|
|
0, 0, maria_log_pagecache,
|
|
|
|
TRANSLOG_DEFAULT_FLAGS))
|
|
|
|
{
|
|
|
|
fprintf(stderr, "Error in initialization");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
if (locking)
|
|
|
|
maria_lock_database(file,F_WRLCK);
|
|
|
|
if (write_cacheing)
|
|
|
|
maria_extra(file,HA_EXTRA_WRITE_CACHE,0);
|
|
|
|
if (opt_quick_mode)
|
|
|
|
maria_extra(file,HA_EXTRA_QUICK,0);
|
|
|
|
|
|
|
|
for (i=0 ; i < recant ; i++)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
ulong blob_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
n1=rnd(1000); n2=rnd(100); n3=rnd(5000);
|
|
|
|
sprintf(record,"%6d:%4d:%8d:Pos: %4d ",n1,n2,n3,write_count);
|
|
|
|
int4store(record+STANDARD_LENGTH-4,(long) i);
|
|
|
|
fix_length(record,(uint) STANDARD_LENGTH+rnd(60));
|
2007-01-18 20:38:14 +01:00
|
|
|
put_blob_in_record(record+blob_pos,&blob_buffer, &blob_length);
|
|
|
|
DBUG_PRINT("test",("record: %d blob_length: %lu", i, blob_length));
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if (maria_write(file,record))
|
|
|
|
{
|
|
|
|
if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0)
|
|
|
|
{
|
|
|
|
printf("Error: %d in write at record: %d\n",my_errno,i);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (verbose) printf(" Double key: %d\n",n3);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (key3[n3] == 1 && first_key <3 && first_key+keys >= 3)
|
|
|
|
{
|
|
|
|
printf("Error: Didn't get error when writing second key: '%8d'\n",n3);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
write_count++; key1[n1]++; key3[n3]=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if we can find key without flushing database */
|
2007-01-18 20:38:14 +01:00
|
|
|
if (i % 10 == 0)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
for (j=rnd(1000)+1 ; j>0 && key1[j] == 0 ; j--) ;
|
|
|
|
if (!j)
|
|
|
|
for (j=999 ; j>0 && key1[j] == 0 ; j--) ;
|
|
|
|
sprintf(key,"%6d",j);
|
|
|
|
if (maria_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
|
|
|
|
{
|
|
|
|
printf("Test in loop: Can't find key: \"%s\"\n",key);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
if (testflag == 1)
|
|
|
|
goto end;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if (write_cacheing)
|
|
|
|
{
|
|
|
|
if (maria_extra(file,HA_EXTRA_NO_CACHE,0))
|
|
|
|
{
|
|
|
|
puts("got error from maria_extra(HA_EXTRA_NO_CACHE)");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
2007-04-19 17:48:36 +02:00
|
|
|
#ifdef REMOVE_WHEN_WE_HAVE_RESIZE
|
2007-04-04 22:37:09 +02:00
|
|
|
if (pagecacheing)
|
2007-04-19 17:48:36 +02:00
|
|
|
resize_pagecache(maria_pagecache, maria_block_size,
|
2007-04-04 22:37:09 +02:00
|
|
|
pagecache_size * 2, 0, 0);
|
2007-04-19 17:48:36 +02:00
|
|
|
#endif
|
2006-04-11 15:45:10 +02:00
|
|
|
if (!silent)
|
|
|
|
printf("- Delete\n");
|
2007-01-18 20:38:14 +01:00
|
|
|
if (srand_arg)
|
|
|
|
srand(srand_arg);
|
2006-04-11 15:45:10 +02:00
|
|
|
for (i=0 ; i<recant/10 ; i++)
|
|
|
|
{
|
|
|
|
for (j=rnd(1000)+1 ; j>0 && key1[j] == 0 ; j--) ;
|
|
|
|
if (j != 0)
|
|
|
|
{
|
|
|
|
sprintf(key,"%6d",j);
|
|
|
|
if (maria_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
|
|
|
|
{
|
|
|
|
printf("can't find key1: \"%s\"\n",key);
|
|
|
|
goto err;
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
if (bcmp(read_record+keyinfo[0].seg[0].start,
|
|
|
|
key, keyinfo[0].seg[0].length))
|
|
|
|
{
|
|
|
|
printf("Found wrong record when searching for key: \"%s\"\n",key);
|
|
|
|
goto err;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
if (opt_delete == (uint) remove_count) /* While testing */
|
|
|
|
goto end;
|
|
|
|
if (maria_delete(file,read_record))
|
|
|
|
{
|
|
|
|
printf("error: %d; can't delete record: \"%s\"\n", my_errno,read_record);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
opt_delete++;
|
|
|
|
key1[atoi(read_record+keyinfo[0].seg[0].start)]--;
|
|
|
|
key3[atoi(read_record+keyinfo[2].seg[0].start)]=0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
puts("Warning: Skipping delete test because no dupplicate keys");
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
if (testflag == 2)
|
|
|
|
goto end;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Update\n");
|
2007-01-18 20:38:14 +01:00
|
|
|
if (srand_arg)
|
|
|
|
srand(srand_arg);
|
2006-04-11 15:45:10 +02:00
|
|
|
for (i=0 ; i<recant/10 ; i++)
|
|
|
|
{
|
|
|
|
n1=rnd(1000); n2=rnd(100); n3=rnd(5000);
|
|
|
|
sprintf(record2,"%6d:%4d:%8d:XXX: %4d ",n1,n2,n3,update);
|
|
|
|
int4store(record2+STANDARD_LENGTH-4,(long) i);
|
|
|
|
fix_length(record2,(uint) STANDARD_LENGTH+rnd(60));
|
|
|
|
|
|
|
|
for (j=rnd(1000)+1 ; j>0 && key1[j] == 0 ; j--) ;
|
|
|
|
if (j != 0)
|
|
|
|
{
|
|
|
|
sprintf(key,"%6d",j);
|
|
|
|
if (maria_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
|
|
|
|
{
|
|
|
|
printf("can't find key1: \"%s\"\n",key);
|
|
|
|
goto err;
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
if (bcmp(read_record+keyinfo[0].seg[0].start,
|
|
|
|
key, keyinfo[0].seg[0].length))
|
|
|
|
{
|
|
|
|
printf("Found wrong record when searching for key: \"%s\"; Found \"%.*s\"\n",
|
|
|
|
key, keyinfo[0].seg[0].length,
|
|
|
|
read_record+keyinfo[0].seg[0].start);
|
|
|
|
goto err;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
if (use_blob)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
ulong blob_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
if (i & 1)
|
2007-01-18 20:38:14 +01:00
|
|
|
put_blob_in_record(record+blob_pos,&blob_buffer, &blob_length);
|
2006-04-11 15:45:10 +02:00
|
|
|
else
|
|
|
|
bmove(record+blob_pos,read_record+blob_pos,8);
|
|
|
|
}
|
|
|
|
if (maria_update(file,read_record,record2))
|
|
|
|
{
|
|
|
|
if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0)
|
|
|
|
{
|
|
|
|
printf("error: %d; can't update:\nFrom: \"%s\"\nTo: \"%s\"\n",
|
|
|
|
my_errno,read_record,record2);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (verbose)
|
|
|
|
printf("Double key when tried to update:\nFrom: \"%s\"\nTo: \"%s\"\n",record,record2);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
key1[atoi(read_record+keyinfo[0].seg[0].start)]--;
|
|
|
|
key3[atoi(read_record+keyinfo[2].seg[0].start)]=0;
|
|
|
|
key1[n1]++; key3[n3]=1;
|
|
|
|
update++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (testflag == 3)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
for (i=999, dupp_keys=j=0 ; i>0 ; i--)
|
|
|
|
{
|
|
|
|
if (key1[i] > dupp_keys)
|
|
|
|
{
|
|
|
|
dupp_keys=key1[i]; j=i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sprintf(key,"%6d",j);
|
|
|
|
start=keyinfo[0].seg[0].start;
|
|
|
|
length=keyinfo[0].seg[0].length;
|
|
|
|
if (dupp_keys)
|
|
|
|
{
|
|
|
|
if (!silent)
|
|
|
|
printf("- Same key: first - next -> last - prev -> first\n");
|
|
|
|
DBUG_PRINT("progpos",("first - next -> last - prev -> first"));
|
|
|
|
if (verbose) printf(" Using key: \"%s\" Keys: %d\n",key,dupp_keys);
|
|
|
|
|
|
|
|
if (maria_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
|
|
|
|
goto err;
|
|
|
|
if (maria_rsame(file,read_record2,-1))
|
|
|
|
goto err;
|
|
|
|
if (memcmp(read_record,read_record2,reclength) != 0)
|
|
|
|
{
|
|
|
|
printf("maria_rsame didn't find same record\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
info.recpos=maria_position(file);
|
|
|
|
if (maria_rfirst(file,read_record2,0) ||
|
|
|
|
maria_rsame_with_pos(file,read_record2,0,info.recpos) ||
|
|
|
|
memcmp(read_record,read_record2,reclength) != 0)
|
|
|
|
{
|
|
|
|
printf("maria_rsame_with_pos didn't find same record\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
info.recpos= maria_position(file);
|
2006-04-11 15:45:10 +02:00
|
|
|
int skr=maria_rnext(file,read_record2,0);
|
|
|
|
if ((skr && my_errno != HA_ERR_END_OF_FILE) ||
|
|
|
|
maria_rprev(file,read_record2,-1) ||
|
2007-01-18 20:38:14 +01:00
|
|
|
memcmp(read_record,read_record2,reclength) != 0 ||
|
|
|
|
info.recpos != maria_position(file))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
printf("maria_rsame_with_pos lost position\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ant=1;
|
|
|
|
while (maria_rnext(file,read_record2,0) == 0 &&
|
|
|
|
memcmp(read_record2+start,key,length) == 0) ant++;
|
|
|
|
if (ant != dupp_keys)
|
|
|
|
{
|
|
|
|
printf("next: Found: %d keys of %d\n",ant,dupp_keys);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
ant=0;
|
|
|
|
while (maria_rprev(file,read_record3,0) == 0 &&
|
|
|
|
bcmp(read_record3+start,key,length) == 0) ant++;
|
|
|
|
if (ant != dupp_keys)
|
|
|
|
{
|
|
|
|
printf("prev: Found: %d records of %d\n",ant,dupp_keys);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check of maria_rnext_same */
|
|
|
|
if (maria_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
|
|
|
|
goto err;
|
|
|
|
ant=1;
|
|
|
|
while (!maria_rnext_same(file,read_record3) && ant < dupp_keys+10)
|
|
|
|
ant++;
|
|
|
|
if (ant != dupp_keys || my_errno != HA_ERR_END_OF_FILE)
|
|
|
|
{
|
|
|
|
printf("maria_rnext_same: Found: %d records of %d\n",ant,dupp_keys);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- All keys: first - next -> last - prev -> first\n");
|
|
|
|
DBUG_PRINT("progpos",("All keys: first - next -> last - prev -> first"));
|
|
|
|
ant=1;
|
|
|
|
if (maria_rfirst(file,read_record,0))
|
|
|
|
{
|
|
|
|
printf("Can't find first record\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
while ((error=maria_rnext(file,read_record3,0)) == 0 && ant < write_count+10)
|
|
|
|
ant++;
|
|
|
|
if (ant != write_count - opt_delete || error != HA_ERR_END_OF_FILE)
|
|
|
|
{
|
|
|
|
printf("next: I found: %d records of %d (error: %d)\n",
|
|
|
|
ant, write_count - opt_delete, error);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (maria_rlast(file,read_record2,0) ||
|
|
|
|
bcmp(read_record2,read_record3,reclength))
|
|
|
|
{
|
|
|
|
printf("Can't find last record\n");
|
|
|
|
DBUG_DUMP("record2",(byte*) read_record2,reclength);
|
|
|
|
DBUG_DUMP("record3",(byte*) read_record3,reclength);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
ant=1;
|
|
|
|
while (maria_rprev(file,read_record3,0) == 0 && ant < write_count+10)
|
|
|
|
ant++;
|
|
|
|
if (ant != write_count - opt_delete)
|
|
|
|
{
|
|
|
|
printf("prev: I found: %d records of %d\n",ant,write_count);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (bcmp(read_record,read_record3,reclength))
|
|
|
|
{
|
|
|
|
printf("Can't find first record\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Test if: Read first - next - prev - prev - next == first\n");
|
|
|
|
DBUG_PRINT("progpos",("- Read first - next - prev - prev - next == first"));
|
|
|
|
if (maria_rfirst(file,read_record,0) ||
|
|
|
|
maria_rnext(file,read_record3,0) ||
|
|
|
|
maria_rprev(file,read_record3,0) ||
|
|
|
|
maria_rprev(file,read_record3,0) == 0 ||
|
|
|
|
maria_rnext(file,read_record3,0))
|
|
|
|
goto err;
|
|
|
|
if (bcmp(read_record,read_record3,reclength) != 0)
|
|
|
|
printf("Can't find first record\n");
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Test if: Read last - prev - next - next - prev == last\n");
|
|
|
|
DBUG_PRINT("progpos",("Read last - prev - next - next - prev == last"));
|
|
|
|
if (maria_rlast(file,read_record2,0) ||
|
|
|
|
maria_rprev(file,read_record3,0) ||
|
|
|
|
maria_rnext(file,read_record3,0) ||
|
|
|
|
maria_rnext(file,read_record3,0) == 0 ||
|
|
|
|
maria_rprev(file,read_record3,0))
|
|
|
|
goto err;
|
|
|
|
if (bcmp(read_record2,read_record3,reclength))
|
|
|
|
printf("Can't find last record\n");
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
puts("- Test read key-part");
|
|
|
|
strmov(key2,key);
|
|
|
|
for(i=strlen(key2) ; i-- > 1 ;)
|
|
|
|
{
|
|
|
|
key2[i]=0;
|
|
|
|
|
|
|
|
/* The following row is just to catch some bugs in the key code */
|
|
|
|
bzero((char*) file->lastkey,file->s->base.max_key_length*2);
|
|
|
|
if (maria_rkey(file,read_record,0,key2,(uint) i,HA_READ_PREFIX))
|
|
|
|
goto err;
|
|
|
|
if (bcmp(read_record+start,key,(uint) i))
|
|
|
|
{
|
|
|
|
puts("Didn't find right record");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dupp_keys > 2)
|
|
|
|
{
|
|
|
|
if (!silent)
|
|
|
|
printf("- Read key (first) - next - delete - next -> last\n");
|
|
|
|
DBUG_PRINT("progpos",("first - next - delete - next -> last"));
|
|
|
|
if (maria_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)) goto err;
|
|
|
|
if (maria_rnext(file,read_record3,0)) goto err;
|
|
|
|
if (maria_delete(file,read_record3)) goto err;
|
|
|
|
opt_delete++;
|
|
|
|
ant=1;
|
|
|
|
while (maria_rnext(file,read_record3,0) == 0 &&
|
|
|
|
bcmp(read_record3+start,key,length) == 0) ant++;
|
|
|
|
if (ant != dupp_keys-1)
|
|
|
|
{
|
|
|
|
printf("next: I can only find: %d keys of %d\n",ant,dupp_keys-1);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dupp_keys>4)
|
|
|
|
{
|
|
|
|
if (!silent)
|
|
|
|
printf("- Read last of key - prev - delete - prev -> first\n");
|
|
|
|
DBUG_PRINT("progpos",("last - prev - delete - prev -> first"));
|
|
|
|
if (maria_rprev(file,read_record3,0)) goto err;
|
|
|
|
if (maria_rprev(file,read_record3,0)) goto err;
|
|
|
|
if (maria_delete(file,read_record3)) goto err;
|
|
|
|
opt_delete++;
|
|
|
|
ant=1;
|
|
|
|
while (maria_rprev(file,read_record3,0) == 0 &&
|
|
|
|
bcmp(read_record3+start,key,length) == 0) ant++;
|
|
|
|
if (ant != dupp_keys-2)
|
|
|
|
{
|
|
|
|
printf("next: I can only find: %d keys of %d\n",ant,dupp_keys-2);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dupp_keys > 6)
|
|
|
|
{
|
|
|
|
if (!silent)
|
|
|
|
printf("- Read first - delete - next -> last\n");
|
|
|
|
DBUG_PRINT("progpos",("first - delete - next -> last"));
|
|
|
|
if (maria_rkey(file,read_record3,0,key,0,HA_READ_KEY_EXACT)) goto err;
|
|
|
|
if (maria_delete(file,read_record3)) goto err;
|
|
|
|
opt_delete++;
|
|
|
|
ant=1;
|
|
|
|
if (maria_rnext(file,read_record,0))
|
|
|
|
goto err; /* Skall finnas poster */
|
|
|
|
while (maria_rnext(file,read_record3,0) == 0 &&
|
|
|
|
bcmp(read_record3+start,key,length) == 0) ant++;
|
|
|
|
if (ant != dupp_keys-3)
|
|
|
|
{
|
|
|
|
printf("next: I can only find: %d keys of %d\n",ant,dupp_keys-3);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Read last - delete - prev -> first\n");
|
|
|
|
DBUG_PRINT("progpos",("last - delete - prev -> first"));
|
|
|
|
if (maria_rprev(file,read_record3,0)) goto err;
|
|
|
|
if (maria_delete(file,read_record3)) goto err;
|
|
|
|
opt_delete++;
|
|
|
|
ant=0;
|
|
|
|
while (maria_rprev(file,read_record3,0) == 0 &&
|
|
|
|
bcmp(read_record3+start,key,length) == 0) ant++;
|
|
|
|
if (ant != dupp_keys-4)
|
|
|
|
{
|
|
|
|
printf("next: I can only find: %d keys of %d\n",ant,dupp_keys-4);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
puts("- Test if: Read rrnd - same");
|
|
|
|
DBUG_PRINT("progpos",("Read rrnd - same"));
|
2007-01-18 20:38:14 +01:00
|
|
|
assert(maria_scan_init(file) == 0);
|
2006-04-11 15:45:10 +02:00
|
|
|
for (i=0 ; i < write_count ; i++)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
int tmp;
|
|
|
|
if ((tmp= maria_scan(file,read_record)) &&
|
|
|
|
tmp != HA_ERR_END_OF_FILE &&
|
|
|
|
tmp != HA_ERR_RECORD_DELETED)
|
|
|
|
{
|
|
|
|
printf("Got error %d when scanning table\n", tmp);
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
2007-01-18 20:38:14 +01:00
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
maria_scan_end(file);
|
|
|
|
if (i != write_count && i != write_count - opt_delete)
|
|
|
|
{
|
|
|
|
printf("Found wrong number of rows while scanning table\n");
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
2007-01-18 20:38:14 +01:00
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
bmove(read_record2,read_record,reclength);
|
|
|
|
for (i=min(2,keys) ; i-- > 0 ;)
|
|
|
|
{
|
|
|
|
if (maria_rsame(file,read_record2,(int) i)) goto err;
|
|
|
|
if (bcmp(read_record,read_record2,reclength) != 0)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
printf("maria_rsame didn't find same record\n");
|
2006-04-11 15:45:10 +02:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!silent)
|
|
|
|
puts("- Test maria_records_in_range");
|
|
|
|
maria_status(file,&info,HA_STATUS_VARIABLE);
|
|
|
|
for (i=0 ; i < info.keys ; i++)
|
|
|
|
{
|
|
|
|
key_range min_key, max_key;
|
|
|
|
if (maria_rfirst(file,read_record,(int) i) ||
|
|
|
|
maria_rlast(file,read_record2,(int) i))
|
|
|
|
goto err;
|
|
|
|
copy_key(file,(uint) i,(uchar*) read_record,(uchar*) key);
|
|
|
|
copy_key(file,(uint) i,(uchar*) read_record2,(uchar*) key2);
|
|
|
|
min_key.key= key;
|
|
|
|
min_key.length= USE_WHOLE_KEY;
|
|
|
|
min_key.flag= HA_READ_KEY_EXACT;
|
|
|
|
max_key.key= key2;
|
|
|
|
max_key.length= USE_WHOLE_KEY;
|
|
|
|
max_key.flag= HA_READ_AFTER_KEY;
|
|
|
|
|
|
|
|
range_records= maria_records_in_range(file,(int) i, &min_key, &max_key);
|
|
|
|
if (range_records < info.records*8/10 ||
|
|
|
|
range_records > info.records*12/10)
|
|
|
|
{
|
|
|
|
printf("maria_records_range returned %ld; Should be about %ld\n",
|
|
|
|
(long) range_records,(long) info.records);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (verbose)
|
|
|
|
{
|
|
|
|
printf("maria_records_range returned %ld; Exact is %ld (diff: %4.2g %%)\n",
|
|
|
|
(long) range_records, (long) info.records,
|
|
|
|
labs((long) range_records - (long) info.records)*100.0/
|
|
|
|
info.records);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (i=0 ; i < 5 ; i++)
|
|
|
|
{
|
|
|
|
for (j=rnd(1000)+1 ; j>0 && key1[j] == 0 ; j--) ;
|
|
|
|
for (k=rnd(1000)+1 ; k>0 && key1[k] == 0 ; k--) ;
|
|
|
|
if (j != 0 && k != 0)
|
|
|
|
{
|
|
|
|
key_range min_key, max_key;
|
|
|
|
if (j > k)
|
|
|
|
swap_variables(int, j, k);
|
|
|
|
sprintf(key,"%6d",j);
|
|
|
|
sprintf(key2,"%6d",k);
|
|
|
|
|
|
|
|
min_key.key= key;
|
|
|
|
min_key.length= USE_WHOLE_KEY;
|
|
|
|
min_key.flag= HA_READ_AFTER_KEY;
|
|
|
|
max_key.key= key2;
|
|
|
|
max_key.length= USE_WHOLE_KEY;
|
|
|
|
max_key.flag= HA_READ_BEFORE_KEY;
|
|
|
|
range_records= maria_records_in_range(file, 0, &min_key, &max_key);
|
|
|
|
records=0;
|
|
|
|
for (j++ ; j < k ; j++)
|
|
|
|
records+=key1[j];
|
|
|
|
if ((long) range_records < (long) records*7/10-2 ||
|
|
|
|
(long) range_records > (long) records*14/10+2)
|
|
|
|
{
|
|
|
|
printf("maria_records_range for key: %d returned %lu; Should be about %lu\n",
|
|
|
|
i, (ulong) range_records, (ulong) records);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (verbose && records)
|
|
|
|
{
|
|
|
|
printf("maria_records_range returned %lu; Exact is %lu (diff: %4.2g %%)\n",
|
|
|
|
(ulong) range_records, (ulong) records,
|
|
|
|
labs((long) range_records-(long) records)*100.0/records);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- maria_info\n");
|
|
|
|
maria_status(file,&info,HA_STATUS_VARIABLE | HA_STATUS_CONST);
|
|
|
|
if (info.records != write_count-opt_delete || info.deleted > opt_delete + update
|
|
|
|
|| info.keys != keys)
|
|
|
|
{
|
|
|
|
puts("Wrong info from maria_info");
|
|
|
|
printf("Got: records: %lu delete: %lu i_keys: %d\n",
|
|
|
|
(ulong) info.records, (ulong) info.deleted, info.keys);
|
|
|
|
}
|
|
|
|
if (verbose)
|
|
|
|
{
|
|
|
|
char buff[80];
|
|
|
|
get_date(buff,3,info.create_time);
|
|
|
|
printf("info: Created %s\n",buff);
|
|
|
|
get_date(buff,3,info.check_time);
|
|
|
|
printf("info: checked %s\n",buff);
|
|
|
|
get_date(buff,3,info.update_time);
|
|
|
|
printf("info: Modified %s\n",buff);
|
|
|
|
}
|
|
|
|
|
|
|
|
maria_panic(HA_PANIC_WRITE);
|
|
|
|
maria_panic(HA_PANIC_READ);
|
|
|
|
if (maria_is_changed(file))
|
|
|
|
puts("Warning: maria_is_changed reported that datafile was changed");
|
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- maria_extra(CACHE) + maria_rrnd.... + maria_extra(NO_CACHE)\n");
|
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
|
|
|
if (maria_reset(file) || maria_extra(file,HA_EXTRA_CACHE,0))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (locking || (!use_blob && !pack_fields))
|
|
|
|
{
|
|
|
|
puts("got error from maria_extra(HA_EXTRA_CACHE)");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ant=0;
|
2007-01-18 20:38:14 +01:00
|
|
|
assert(maria_scan_init(file) == 0);
|
|
|
|
while ((error= maria_scan(file,record)) != HA_ERR_END_OF_FILE &&
|
2006-04-11 15:45:10 +02:00
|
|
|
ant < write_count + 10)
|
2007-01-18 20:38:14 +01:00
|
|
|
ant+= error ? 0 : 1;
|
|
|
|
maria_scan_end(file);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (ant != write_count-opt_delete)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
printf("scan with cache: I can only find: %d records of %d\n",
|
2006-04-11 15:45:10 +02:00
|
|
|
ant,write_count-opt_delete);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (maria_extra(file,HA_EXTRA_NO_CACHE,0))
|
|
|
|
{
|
|
|
|
puts("got error from maria_extra(HA_EXTRA_NO_CACHE)");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
ant=0;
|
|
|
|
maria_scan_init(file);
|
|
|
|
while ((error=maria_scan(file,record)) != HA_ERR_END_OF_FILE &&
|
|
|
|
ant < write_count + 10)
|
|
|
|
ant+= error ? 0 : 1;
|
|
|
|
if (ant != write_count-opt_delete)
|
|
|
|
{
|
|
|
|
printf("scan with cache: I can only find: %d records of %d\n",
|
|
|
|
ant,write_count-opt_delete);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
if (testflag == 4)
|
|
|
|
goto end;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if (!silent)
|
|
|
|
printf("- Removing keys\n");
|
|
|
|
DBUG_PRINT("progpos",("Removing keys"));
|
|
|
|
lastpos = HA_OFFSET_ERROR;
|
|
|
|
/* DBUG_POP(); */
|
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
|
|
|
maria_reset(file);
|
2006-04-11 15:45:10 +02:00
|
|
|
found_parts=0;
|
2007-01-18 20:38:14 +01:00
|
|
|
maria_scan_init(file);
|
|
|
|
while ((error= maria_scan(file,read_record)) != HA_ERR_END_OF_FILE)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
info.recpos=maria_position(file);
|
|
|
|
if (lastpos >= info.recpos && lastpos != HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
printf("maria_rrnd didn't advance filepointer; old: %ld, new: %ld\n",
|
|
|
|
(long) lastpos, (long) info.recpos);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
lastpos=info.recpos;
|
|
|
|
if (error == 0)
|
|
|
|
{
|
|
|
|
if (opt_delete == (uint) remove_count) /* While testing */
|
|
|
|
goto end;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (rnd(2) == 1 && maria_rsame(file,read_record,-1))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
printf("can't find record %lx\n",(long) info.recpos);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (use_blob)
|
|
|
|
{
|
|
|
|
ulong blob_length,pos;
|
|
|
|
uchar *ptr;
|
2007-04-05 13:38:05 +02:00
|
|
|
memcpy_fixed(&ptr, read_record+blob_pos+4, sizeof(ptr));
|
2006-04-11 15:45:10 +02:00
|
|
|
longget(blob_length,read_record+blob_pos);
|
|
|
|
for (pos=0 ; pos < blob_length ; pos++)
|
|
|
|
{
|
|
|
|
if (ptr[pos] != (uchar) (blob_length+pos))
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
printf("Found blob with wrong info at %ld\n",(long) lastpos);
|
|
|
|
maria_scan_end(file);
|
|
|
|
my_errno= 0;
|
|
|
|
goto err;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (maria_delete(file,read_record))
|
|
|
|
{
|
|
|
|
printf("can't delete record: %6.6s, delete_count: %d\n",
|
|
|
|
read_record, opt_delete);
|
2007-01-18 20:38:14 +01:00
|
|
|
maria_scan_end(file);
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
opt_delete++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
found_parts++;
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
maria_scan_end(file);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (my_errno != HA_ERR_END_OF_FILE && my_errno != HA_ERR_RECORD_DELETED)
|
|
|
|
printf("error: %d from maria_rrnd\n",my_errno);
|
|
|
|
if (write_count != opt_delete)
|
|
|
|
{
|
|
|
|
printf("Deleted only %d of %d records (%d parts)\n",opt_delete,write_count,
|
|
|
|
found_parts);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
end:
|
|
|
|
if (maria_close(file))
|
|
|
|
goto err;
|
|
|
|
maria_panic(HA_PANIC_CLOSE); /* Should close log */
|
|
|
|
if (!silent)
|
|
|
|
{
|
|
|
|
printf("\nFollowing test have been made:\n");
|
|
|
|
printf("Write records: %d\nUpdate records: %d\nSame-key-read: %d\nDelete records: %d\n", write_count,update,dupp_keys,opt_delete);
|
|
|
|
if (rec_pointer_size)
|
|
|
|
printf("Record pointer size: %d\n",rec_pointer_size);
|
|
|
|
printf("maria_block_size: %lu\n", maria_block_size);
|
2007-04-19 17:48:36 +02:00
|
|
|
if (write_cacheing)
|
|
|
|
puts("Key cache resized");
|
2006-04-11 15:45:10 +02:00
|
|
|
if (write_cacheing)
|
|
|
|
puts("Write cacheing used");
|
|
|
|
if (write_cacheing)
|
|
|
|
puts("quick mode");
|
|
|
|
if (async_io && locking)
|
|
|
|
puts("Asyncron io with locking used");
|
|
|
|
else if (locking)
|
|
|
|
puts("Locking used");
|
|
|
|
if (use_blob)
|
|
|
|
puts("blobs used");
|
|
|
|
printf("key cache status: \n\
|
|
|
|
blocks used:%10lu\n\
|
|
|
|
not flushed:%10lu\n\
|
|
|
|
w_requests: %10lu\n\
|
|
|
|
writes: %10lu\n\
|
|
|
|
r_requests: %10lu\n\
|
|
|
|
reads: %10lu\n",
|
2007-04-04 22:37:09 +02:00
|
|
|
maria_pagecache->blocks_used,
|
|
|
|
maria_pagecache->global_blocks_changed,
|
|
|
|
(ulong) maria_pagecache->global_cache_w_requests,
|
|
|
|
(ulong) maria_pagecache->global_cache_write,
|
|
|
|
(ulong) maria_pagecache->global_cache_r_requests,
|
|
|
|
(ulong) maria_pagecache->global_cache_read);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-04-04 22:37:09 +02:00
|
|
|
end_pagecache(maria_pagecache,1);
|
2007-01-18 20:38:14 +01:00
|
|
|
my_free(blob_buffer, MYF(MY_ALLOW_ZERO_PTR));
|
2006-04-11 15:45:10 +02:00
|
|
|
my_end(silent ? MY_CHECK_ERROR : MY_CHECK_ERROR | MY_GIVE_INFO);
|
|
|
|
return(0);
|
|
|
|
err:
|
|
|
|
printf("got error: %d when using MARIA-database\n",my_errno);
|
|
|
|
if (file)
|
|
|
|
VOID(maria_close(file));
|
|
|
|
maria_end();
|
|
|
|
return(1);
|
|
|
|
} /* main */
|
|
|
|
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
/* Read options */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
static void get_options(int argc, char **argv)
|
|
|
|
{
|
|
|
|
char *pos,*progname;
|
|
|
|
|
|
|
|
progname= argv[0];
|
|
|
|
|
|
|
|
while (--argc >0 && *(pos = *(++argv)) == '-' ) {
|
|
|
|
switch(*++pos) {
|
|
|
|
case 'B':
|
|
|
|
pack_type= HA_BINARY_PACK_KEY;
|
|
|
|
break;
|
|
|
|
case 'b':
|
2007-01-18 20:38:14 +01:00
|
|
|
use_blob= 1;
|
|
|
|
if (*++pos)
|
|
|
|
use_blob= atol(pos);
|
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
|
|
|
if (*++pos)
|
2007-04-04 22:37:09 +02:00
|
|
|
pagecache_size=atol(pos);
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
case 'W': /* Use write cacheing */
|
|
|
|
write_cacheing=1;
|
|
|
|
if (*++pos)
|
|
|
|
my_default_record_cache_size=atoi(pos);
|
|
|
|
break;
|
|
|
|
case 'd':
|
|
|
|
remove_count= atoi(++pos);
|
|
|
|
break;
|
|
|
|
case 'i':
|
|
|
|
if (*++pos)
|
2007-01-18 20:38:14 +01:00
|
|
|
srand(srand_arg= atoi(pos));
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
case 'L':
|
|
|
|
locking=1;
|
|
|
|
break;
|
|
|
|
case 'A': /* use asyncron io */
|
|
|
|
async_io=1;
|
|
|
|
if (*++pos)
|
|
|
|
my_default_record_cache_size=atoi(pos);
|
|
|
|
break;
|
|
|
|
case 'v': /* verbose */
|
|
|
|
verbose=1;
|
|
|
|
break;
|
|
|
|
case 'm': /* records */
|
2007-01-18 20:38:14 +01:00
|
|
|
if ((recant=atoi(++pos)) < 10 && testflag > 1)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
fprintf(stderr,"record count must be >= 10 (if testflag != 1)\n");
|
2006-04-11 15:45:10 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'e': /* maria_block_length */
|
2007-04-19 17:48:36 +02:00
|
|
|
case 'E':
|
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
|
|
|
if ((maria_block_size= atoi(++pos)) < MARIA_MIN_KEY_BLOCK_LENGTH ||
|
2006-04-11 15:45:10 +02:00
|
|
|
maria_block_size > MARIA_MAX_KEY_BLOCK_LENGTH)
|
|
|
|
{
|
|
|
|
fprintf(stderr,"Wrong maria_block_length\n");
|
|
|
|
exit(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
|
|
|
maria_block_size= my_round_up_to_next_power(maria_block_size);
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
if ((first_key=atoi(++pos)) < 0 || first_key >= MARIA_KEYS)
|
|
|
|
first_key=0;
|
|
|
|
break;
|
|
|
|
case 'k':
|
|
|
|
if ((keys=(uint) atoi(++pos)) < 1 ||
|
|
|
|
keys > (uint) (MARIA_KEYS-first_key))
|
|
|
|
keys=MARIA_KEYS-first_key;
|
|
|
|
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 'P':
|
|
|
|
pack_type=0; /* Don't use DIFF_LENGTH */
|
|
|
|
pack_seg=0;
|
|
|
|
break;
|
|
|
|
case 'R': /* Length of record pointer */
|
|
|
|
rec_pointer_size=atoi(++pos);
|
|
|
|
if (rec_pointer_size > 7)
|
|
|
|
rec_pointer_size=0;
|
|
|
|
break;
|
|
|
|
case 'S':
|
|
|
|
pack_fields=0; /* Static-length-records */
|
2007-01-18 20:38:14 +01:00
|
|
|
record_type= STATIC_RECORD;
|
2006-04-11 15:45:10 +02:00
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
silent=1;
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
testflag=atoi(++pos); /* testmod */
|
|
|
|
break;
|
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
|
|
|
case 'T':
|
|
|
|
transactional= 1;
|
|
|
|
break;
|
2006-04-11 15:45:10 +02:00
|
|
|
case 'q':
|
|
|
|
opt_quick_mode=1;
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
create_flag|= HA_CREATE_CHECKSUM;
|
|
|
|
break;
|
|
|
|
case 'D':
|
|
|
|
create_flag|=HA_CREATE_DELAY_KEY_WRITE;
|
|
|
|
break;
|
|
|
|
case '?':
|
|
|
|
case 'I':
|
|
|
|
case 'V':
|
2007-01-18 20:38:14 +01:00
|
|
|
printf("%s Ver 1.0 for %s at %s\n",progname,SYSTEM_TYPE,MACHINE_TYPE);
|
2006-04-11 15:45:10 +02:00
|
|
|
puts("By Monty, for your professional use\n");
|
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
|
|
|
printf("Usage: %s [-?AbBcDIKLPRqSsTVWltv] [-k#] [-f#] [-m#] [-e#] [-E#] [-t#]\n",
|
2006-04-11 15:45:10 +02:00
|
|
|
progname);
|
|
|
|
exit(0);
|
|
|
|
case '#':
|
|
|
|
DBUG_PUSH (++pos);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printf("Illegal option: '%c'\n",*pos);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
} /* get options */
|
|
|
|
|
|
|
|
/* Get a random value 0 <= x <= n */
|
|
|
|
|
|
|
|
static uint rnd(uint max_value)
|
|
|
|
{
|
|
|
|
return (uint) ((rand() & 32767)/32767.0*max_value);
|
|
|
|
} /* rnd */
|
|
|
|
|
|
|
|
|
|
|
|
/* Create a variable length record */
|
|
|
|
|
|
|
|
static void fix_length(byte *rec, uint length)
|
|
|
|
{
|
|
|
|
bmove(rec+STANDARD_LENGTH,
|
|
|
|
"0123456789012345678901234567890123456789012345678901234567890",
|
|
|
|
length-STANDARD_LENGTH);
|
|
|
|
strfill(rec+length,STANDARD_LENGTH+60-length,' ');
|
|
|
|
} /* fix_length */
|
|
|
|
|
|
|
|
|
|
|
|
/* Put maybe a blob in record */
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static void put_blob_in_record(char *blob_pos, char **blob_buffer,
|
|
|
|
ulong *blob_length)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
ulong i,length;
|
|
|
|
if (use_blob)
|
|
|
|
{
|
|
|
|
if (rnd(10) == 0)
|
|
|
|
{
|
|
|
|
if (! *blob_buffer &&
|
|
|
|
!(*blob_buffer=my_malloc((uint) use_blob,MYF(MY_WME))))
|
|
|
|
{
|
|
|
|
use_blob=0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
length=rnd(use_blob);
|
|
|
|
for (i=0 ; i < length ; i++)
|
|
|
|
(*blob_buffer)[i]=(char) (length+i);
|
|
|
|
int4store(blob_pos,length);
|
|
|
|
memcpy_fixed(blob_pos+4,(char*) blob_buffer,sizeof(char*));
|
2007-01-18 20:38:14 +01:00
|
|
|
*blob_length= length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int4store(blob_pos,0);
|
2007-01-18 20:38:14 +01:00
|
|
|
*blob_length= 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void copy_key(MARIA_HA *info,uint inx,uchar *rec,uchar *key_buff)
|
|
|
|
{
|
|
|
|
HA_KEYSEG *keyseg;
|
|
|
|
|
|
|
|
for (keyseg=info->s->keyinfo[inx].seg ; keyseg->type ; keyseg++)
|
|
|
|
{
|
|
|
|
memcpy(key_buff,rec+keyseg->start,(size_t) keyseg->length);
|
|
|
|
key_buff+=keyseg->length;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|