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 */
|
|
|
|
|
|
|
|
/*
|
|
|
|
Functions to handle space-packed-records and blobs
|
|
|
|
|
|
|
|
A row may be stored in one or more linked blocks.
|
|
|
|
The block size is between MARIA_MIN_BLOCK_LENGTH and MARIA_MAX_BLOCK_LENGTH.
|
|
|
|
Each block is aligned on MARIA_DYN_ALIGN_SIZE.
|
|
|
|
The reson for the max block size is to not have too many different types
|
|
|
|
of blocks. For the differnet block types, look at _ma_get_block_info()
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "maria_def.h"
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static my_bool write_dynamic_record(MARIA_HA *info,const byte *record,
|
|
|
|
ulong reclength);
|
2006-04-11 15:45:10 +02:00
|
|
|
static int _ma_find_writepos(MARIA_HA *info,ulong reclength,my_off_t *filepos,
|
|
|
|
ulong *length);
|
2007-01-18 20:38:14 +01:00
|
|
|
static my_bool update_dynamic_record(MARIA_HA *info, MARIA_RECORD_POS filepos,
|
|
|
|
byte *record, ulong reclength);
|
|
|
|
static my_bool delete_dynamic_record(MARIA_HA *info,MARIA_RECORD_POS filepos,
|
|
|
|
uint second_read);
|
|
|
|
static my_bool _ma_cmp_buffer(File file, const byte *buff, my_off_t filepos,
|
|
|
|
uint length);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
#ifdef THREAD
|
|
|
|
/* Play it safe; We have a small stack when using threads */
|
|
|
|
#undef my_alloca
|
|
|
|
#undef my_afree
|
|
|
|
#define my_alloca(A) my_malloc((A),MYF(0))
|
|
|
|
#define my_afree(A) my_free((A),MYF(0))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Interface function from MARIA_HA */
|
|
|
|
|
|
|
|
#ifdef HAVE_MMAP
|
|
|
|
|
|
|
|
/*
|
|
|
|
Create mmaped area for MARIA handler
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_dynmap_file()
|
|
|
|
info MARIA handler
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
1 error.
|
|
|
|
*/
|
|
|
|
|
|
|
|
my_bool _ma_dynmap_file(MARIA_HA *info, my_off_t size)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("_ma_dynmap_file");
|
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 (size > (my_off_t) (~((size_t) 0)) - MEMMAP_EXTRA_MARGIN)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("warning", ("File is too large for mmap"));
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
2007-03-01 18:23:58 +01:00
|
|
|
/*
|
|
|
|
Ingo wonders if it is good to use MAP_NORESERVE. From the Linux man page:
|
|
|
|
MAP_NORESERVE
|
|
|
|
Do not reserve swap space for this mapping. When swap space is
|
|
|
|
reserved, one has the guarantee that it is possible to modify the
|
|
|
|
mapping. When swap space is not reserved one might get SIGSEGV
|
|
|
|
upon a write if no physical memory is available.
|
|
|
|
*/
|
2006-04-11 15:45:10 +02:00
|
|
|
info->s->file_map= (byte*)
|
|
|
|
my_mmap(0, (size_t)(size + MEMMAP_EXTRA_MARGIN),
|
|
|
|
info->s->mode==O_RDONLY ? PROT_READ :
|
|
|
|
PROT_READ | PROT_WRITE,
|
|
|
|
MAP_SHARED | MAP_NORESERVE,
|
2007-04-04 22:37:09 +02:00
|
|
|
info->dfile.file, 0L);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (info->s->file_map == (byte*) MAP_FAILED)
|
|
|
|
{
|
|
|
|
info->s->file_map= NULL;
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
#if defined(HAVE_MADVISE)
|
|
|
|
madvise(info->s->file_map, size, MADV_RANDOM);
|
|
|
|
#endif
|
|
|
|
info->s->mmaped_length= size;
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Resize mmaped area for MARIA handler
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_remap_file()
|
|
|
|
info MARIA handler
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
*/
|
|
|
|
|
|
|
|
void _ma_remap_file(MARIA_HA *info, my_off_t size)
|
|
|
|
{
|
|
|
|
if (info->s->file_map)
|
|
|
|
{
|
|
|
|
VOID(my_munmap(info->s->file_map,
|
|
|
|
(size_t) info->s->mmaped_length + MEMMAP_EXTRA_MARGIN));
|
|
|
|
_ma_dynmap_file(info, size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Read bytes from MySAM handler, using mmap or pread
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_mmap_pread()
|
|
|
|
info MARIA handler
|
|
|
|
Buffer Input buffer
|
|
|
|
Count Count of bytes for read
|
|
|
|
offset Start position
|
|
|
|
MyFlags
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
*/
|
|
|
|
|
|
|
|
uint _ma_mmap_pread(MARIA_HA *info, byte *Buffer,
|
|
|
|
uint Count, my_off_t offset, myf MyFlags)
|
|
|
|
{
|
2007-04-04 22:37:09 +02:00
|
|
|
DBUG_PRINT("info", ("maria_read with mmap %d\n", info->dfile.file));
|
2006-04-11 15:45:10 +02:00
|
|
|
if (info->s->concurrent_insert)
|
|
|
|
rw_rdlock(&info->s->mmap_lock);
|
|
|
|
|
|
|
|
/*
|
|
|
|
The following test may fail in the following cases:
|
|
|
|
- We failed to remap a memory area (fragmented memory?)
|
|
|
|
- This thread has done some writes, but not yet extended the
|
|
|
|
memory mapped area.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (info->s->mmaped_length >= offset + Count)
|
|
|
|
{
|
|
|
|
memcpy(Buffer, info->s->file_map + offset, Count);
|
|
|
|
if (info->s->concurrent_insert)
|
|
|
|
rw_unlock(&info->s->mmap_lock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (info->s->concurrent_insert)
|
|
|
|
rw_unlock(&info->s->mmap_lock);
|
2007-04-04 22:37:09 +02:00
|
|
|
return my_pread(info->dfile.file, Buffer, Count, offset, MyFlags);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* wrapper for my_pread in case if mmap isn't used */
|
|
|
|
|
|
|
|
uint _ma_nommap_pread(MARIA_HA *info, byte *Buffer,
|
|
|
|
uint Count, my_off_t offset, myf MyFlags)
|
|
|
|
{
|
2007-04-04 22:37:09 +02:00
|
|
|
return my_pread(info->dfile.file, Buffer, Count, offset, MyFlags);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Write bytes to MySAM handler, using mmap or pwrite
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_mmap_pwrite()
|
|
|
|
info MARIA handler
|
|
|
|
Buffer Output buffer
|
|
|
|
Count Count of bytes for write
|
|
|
|
offset Start position
|
|
|
|
MyFlags
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
!=0 error. In this case return error from pwrite
|
|
|
|
*/
|
|
|
|
|
|
|
|
uint _ma_mmap_pwrite(MARIA_HA *info, byte *Buffer,
|
|
|
|
uint Count, my_off_t offset, myf MyFlags)
|
|
|
|
{
|
2007-04-04 22:37:09 +02:00
|
|
|
DBUG_PRINT("info", ("maria_write with mmap %d\n", info->dfile.file));
|
2006-04-11 15:45:10 +02:00
|
|
|
if (info->s->concurrent_insert)
|
|
|
|
rw_rdlock(&info->s->mmap_lock);
|
|
|
|
|
|
|
|
/*
|
|
|
|
The following test may fail in the following cases:
|
|
|
|
- We failed to remap a memory area (fragmented memory?)
|
|
|
|
- This thread has done some writes, but not yet extended the
|
|
|
|
memory mapped area.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (info->s->mmaped_length >= offset + Count)
|
|
|
|
{
|
|
|
|
memcpy(info->s->file_map + offset, Buffer, Count);
|
|
|
|
if (info->s->concurrent_insert)
|
|
|
|
rw_unlock(&info->s->mmap_lock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
info->s->nonmmaped_inserts++;
|
|
|
|
if (info->s->concurrent_insert)
|
|
|
|
rw_unlock(&info->s->mmap_lock);
|
2007-04-04 22:37:09 +02:00
|
|
|
return my_pwrite(info->dfile.file, Buffer, Count, offset, MyFlags);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* wrapper for my_pwrite in case if mmap isn't used */
|
|
|
|
|
|
|
|
uint _ma_nommap_pwrite(MARIA_HA *info, byte *Buffer,
|
|
|
|
uint Count, my_off_t offset, myf MyFlags)
|
|
|
|
{
|
2007-04-04 22:37:09 +02:00
|
|
|
return my_pwrite(info->dfile.file, Buffer, Count, offset, MyFlags);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
my_bool _ma_write_dynamic_record(MARIA_HA *info, const byte *record)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
ulong reclength= _ma_rec_pack(info,info->rec_buff + MARIA_REC_BUFF_OFFSET,
|
|
|
|
record);
|
|
|
|
return (write_dynamic_record(info,info->rec_buff + MARIA_REC_BUFF_OFFSET,
|
|
|
|
reclength));
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
my_bool _ma_update_dynamic_record(MARIA_HA *info, MARIA_RECORD_POS pos,
|
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
|
|
|
const byte *oldrec __attribute__ ((unused)),
|
2007-01-18 20:38:14 +01:00
|
|
|
const byte *record)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
uint length= _ma_rec_pack(info, info->rec_buff + MARIA_REC_BUFF_OFFSET,
|
|
|
|
record);
|
|
|
|
return (update_dynamic_record(info, pos,
|
|
|
|
info->rec_buff + MARIA_REC_BUFF_OFFSET,
|
|
|
|
length));
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
|
|
|
|
my_bool _ma_write_blob_record(MARIA_HA *info, const byte *record)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
byte *rec_buff;
|
|
|
|
int error;
|
|
|
|
ulong reclength,reclength2,extra;
|
|
|
|
|
|
|
|
extra= (ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER)+MARIA_SPLIT_LENGTH+
|
|
|
|
MARIA_DYN_DELETE_BLOCK_HEADER+1);
|
|
|
|
reclength= (info->s->base.pack_reclength +
|
|
|
|
_ma_calc_total_blob_length(info,record)+ extra);
|
|
|
|
if (!(rec_buff=(byte*) my_alloca(reclength)))
|
|
|
|
{
|
2007-03-01 18:23:58 +01:00
|
|
|
my_errno= HA_ERR_OUT_OF_MEM; /* purecov: inspected */
|
2007-01-18 20:38:14 +01:00
|
|
|
return(1);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
reclength2= _ma_rec_pack(info,
|
|
|
|
rec_buff+ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER),
|
2006-04-11 15:45:10 +02:00
|
|
|
record);
|
|
|
|
DBUG_PRINT("info",("reclength: %lu reclength2: %lu",
|
|
|
|
reclength, reclength2));
|
|
|
|
DBUG_ASSERT(reclength2 <= reclength);
|
2007-01-18 20:38:14 +01:00
|
|
|
error= write_dynamic_record(info,
|
|
|
|
rec_buff+ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER),
|
|
|
|
reclength2);
|
2006-04-11 15:45:10 +02:00
|
|
|
my_afree(rec_buff);
|
2007-01-18 20:38:14 +01:00
|
|
|
return(error != 0);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
my_bool _ma_update_blob_record(MARIA_HA *info, MARIA_RECORD_POS pos,
|
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
|
|
|
const byte *oldrec __attribute__ ((unused)),
|
2007-01-18 20:38:14 +01:00
|
|
|
const byte *record)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
byte *rec_buff;
|
|
|
|
int error;
|
|
|
|
ulong reclength,extra;
|
|
|
|
|
|
|
|
extra= (ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER)+MARIA_SPLIT_LENGTH+
|
|
|
|
MARIA_DYN_DELETE_BLOCK_HEADER);
|
|
|
|
reclength= (info->s->base.pack_reclength+
|
|
|
|
_ma_calc_total_blob_length(info,record)+ extra);
|
|
|
|
#ifdef NOT_USED /* We now support big rows */
|
|
|
|
if (reclength > MARIA_DYN_MAX_ROW_LENGTH)
|
|
|
|
{
|
|
|
|
my_errno=HA_ERR_TO_BIG_ROW;
|
2007-01-18 20:38:14 +01:00
|
|
|
return 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (!(rec_buff=(byte*) my_alloca(reclength)))
|
|
|
|
{
|
2007-03-01 18:23:58 +01:00
|
|
|
my_errno= HA_ERR_OUT_OF_MEM; /* purecov: inspected */
|
2007-01-18 20:38:14 +01:00
|
|
|
return(1);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
reclength= _ma_rec_pack(info,rec_buff+ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER),
|
|
|
|
record);
|
|
|
|
error=update_dynamic_record(info,pos,
|
|
|
|
rec_buff+ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER),
|
|
|
|
reclength);
|
|
|
|
my_afree(rec_buff);
|
2007-01-18 20:38:14 +01:00
|
|
|
return(error != 0);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
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
|
|
|
my_bool _ma_delete_dynamic_record(MARIA_HA *info,
|
|
|
|
const byte *record __attribute__ ((unused)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
return delete_dynamic_record(info, info->cur_row.lastpos, 0);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Write record to data-file */
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static my_bool write_dynamic_record(MARIA_HA *info, const byte *record,
|
|
|
|
ulong reclength)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
int flag;
|
|
|
|
ulong length;
|
|
|
|
my_off_t filepos;
|
|
|
|
DBUG_ENTER("write_dynamic_record");
|
|
|
|
|
|
|
|
flag=0;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (_ma_find_writepos(info,reclength,&filepos,&length))
|
|
|
|
goto err;
|
|
|
|
if (_ma_write_part_record(info,filepos,length,
|
|
|
|
(info->append_insert_at_end ?
|
|
|
|
HA_OFFSET_ERROR : info->s->state.dellink),
|
|
|
|
(byte**) &record,&reclength,&flag))
|
|
|
|
goto err;
|
|
|
|
} while (reclength);
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Get a block for data ; The given data-area must be used !! */
|
|
|
|
|
|
|
|
static int _ma_find_writepos(MARIA_HA *info,
|
|
|
|
ulong reclength, /* record length */
|
|
|
|
my_off_t *filepos, /* Return file pos */
|
|
|
|
ulong *length) /* length of block at filepos */
|
|
|
|
{
|
|
|
|
MARIA_BLOCK_INFO block_info;
|
|
|
|
ulong tmp;
|
|
|
|
DBUG_ENTER("_ma_find_writepos");
|
|
|
|
|
|
|
|
if (info->s->state.dellink != HA_OFFSET_ERROR &&
|
|
|
|
!info->append_insert_at_end)
|
|
|
|
{
|
|
|
|
/* Deleted blocks exists; Get last used block */
|
|
|
|
*filepos=info->s->state.dellink;
|
|
|
|
block_info.second_read=0;
|
|
|
|
info->rec_cache.seek_not_done=1;
|
2007-04-04 22:37:09 +02:00
|
|
|
if (!(_ma_get_block_info(&block_info, info->dfile.file,
|
|
|
|
info->s->state.dellink) &
|
2006-04-11 15:45:10 +02:00
|
|
|
BLOCK_DELETED))
|
|
|
|
{
|
|
|
|
DBUG_PRINT("error",("Delete link crashed"));
|
|
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
|
|
DBUG_RETURN(-1);
|
|
|
|
}
|
|
|
|
info->s->state.dellink=block_info.next_filepos;
|
|
|
|
info->state->del--;
|
|
|
|
info->state->empty-= block_info.block_len;
|
|
|
|
*length= block_info.block_len;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* No deleted blocks; Allocate a new block */
|
|
|
|
*filepos=info->state->data_file_length;
|
|
|
|
if ((tmp=reclength+3 + test(reclength >= (65520-3))) <
|
|
|
|
info->s->base.min_block_length)
|
|
|
|
tmp= info->s->base.min_block_length;
|
|
|
|
else
|
|
|
|
tmp= ((tmp+MARIA_DYN_ALIGN_SIZE-1) &
|
|
|
|
(~ (ulong) (MARIA_DYN_ALIGN_SIZE-1)));
|
|
|
|
if (info->state->data_file_length >
|
|
|
|
(info->s->base.max_data_file_length - tmp))
|
|
|
|
{
|
|
|
|
my_errno=HA_ERR_RECORD_FILE_FULL;
|
|
|
|
DBUG_RETURN(-1);
|
|
|
|
}
|
|
|
|
if (tmp > MARIA_MAX_BLOCK_LENGTH)
|
|
|
|
tmp=MARIA_MAX_BLOCK_LENGTH;
|
|
|
|
*length= tmp;
|
|
|
|
info->state->data_file_length+= tmp;
|
|
|
|
info->s->state.split++;
|
|
|
|
info->update|=HA_STATE_WRITE_AT_END;
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
} /* _ma_find_writepos */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Unlink a deleted block from the deleted list.
|
|
|
|
This block will be combined with the preceding or next block to form
|
|
|
|
a big block.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static bool unlink_deleted_block(MARIA_HA *info, MARIA_BLOCK_INFO *block_info)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("unlink_deleted_block");
|
|
|
|
if (block_info->filepos == info->s->state.dellink)
|
|
|
|
{
|
|
|
|
/* First deleted block; We can just use this ! */
|
|
|
|
info->s->state.dellink=block_info->next_filepos;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
MARIA_BLOCK_INFO tmp;
|
|
|
|
tmp.second_read=0;
|
|
|
|
/* Unlink block from the previous block */
|
2007-04-04 22:37:09 +02:00
|
|
|
if (!(_ma_get_block_info(&tmp, info->dfile.file, block_info->prev_filepos)
|
2006-04-11 15:45:10 +02:00
|
|
|
& BLOCK_DELETED))
|
|
|
|
DBUG_RETURN(1); /* Something is wrong */
|
|
|
|
mi_sizestore(tmp.header+4,block_info->next_filepos);
|
|
|
|
if (info->s->file_write(info,(char*) tmp.header+4,8,
|
|
|
|
block_info->prev_filepos+4, MYF(MY_NABP)))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
/* Unlink block from next block */
|
|
|
|
if (block_info->next_filepos != HA_OFFSET_ERROR)
|
|
|
|
{
|
2007-04-04 22:37:09 +02:00
|
|
|
if (!(_ma_get_block_info(&tmp, info->dfile.file,
|
|
|
|
block_info->next_filepos)
|
2006-04-11 15:45:10 +02:00
|
|
|
& BLOCK_DELETED))
|
|
|
|
DBUG_RETURN(1); /* Something is wrong */
|
|
|
|
mi_sizestore(tmp.header+12,block_info->prev_filepos);
|
|
|
|
if (info->s->file_write(info,(char*) tmp.header+12,8,
|
|
|
|
block_info->next_filepos+12,
|
|
|
|
MYF(MY_NABP)))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* We now have one less deleted block */
|
|
|
|
info->state->del--;
|
|
|
|
info->state->empty-= block_info->block_len;
|
|
|
|
info->s->state.split--;
|
|
|
|
|
|
|
|
/*
|
|
|
|
If this was a block that we where accessing through table scan
|
|
|
|
(maria_rrnd() or maria_scan(), then ensure that we skip over this block
|
|
|
|
when doing next maria_rrnd() or maria_scan().
|
|
|
|
*/
|
2007-01-18 20:38:14 +01:00
|
|
|
if (info->cur_row.nextpos == block_info->filepos)
|
|
|
|
info->cur_row.nextpos+= block_info->block_len;
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Add a backward link to delete block
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
update_backward_delete_link()
|
|
|
|
info MARIA handler
|
|
|
|
delete_block Position to delete block to update.
|
|
|
|
If this is 'HA_OFFSET_ERROR', nothing will be done
|
|
|
|
filepos Position to block that 'delete_block' should point to
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
1 error. In this case my_error is set.
|
|
|
|
*/
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static my_bool update_backward_delete_link(MARIA_HA *info,
|
|
|
|
my_off_t delete_block,
|
|
|
|
MARIA_RECORD_POS filepos)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
MARIA_BLOCK_INFO block_info;
|
|
|
|
DBUG_ENTER("update_backward_delete_link");
|
|
|
|
|
|
|
|
if (delete_block != HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
block_info.second_read=0;
|
2007-04-04 22:37:09 +02:00
|
|
|
if (_ma_get_block_info(&block_info, info->dfile.file, delete_block)
|
2006-04-11 15:45:10 +02:00
|
|
|
& BLOCK_DELETED)
|
|
|
|
{
|
|
|
|
char buff[8];
|
|
|
|
mi_sizestore(buff,filepos);
|
|
|
|
if (info->s->file_write(info,buff, 8, delete_block+12, MYF(MY_NABP)))
|
|
|
|
DBUG_RETURN(1); /* Error on write */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
|
|
DBUG_RETURN(1); /* Wrong delete link */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
/* Delete datarecord from database */
|
|
|
|
/* info->rec_cache.seek_not_done is updated in cmp_record */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static my_bool delete_dynamic_record(MARIA_HA *info, MARIA_RECORD_POS filepos,
|
|
|
|
uint second_read)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint length,b_type;
|
|
|
|
MARIA_BLOCK_INFO block_info,del_block;
|
|
|
|
int error;
|
|
|
|
my_bool remove_next_block;
|
|
|
|
DBUG_ENTER("delete_dynamic_record");
|
|
|
|
|
|
|
|
/* First add a link from the last block to the new one */
|
|
|
|
error= update_backward_delete_link(info, info->s->state.dellink, filepos);
|
|
|
|
|
|
|
|
block_info.second_read=second_read;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
/* Remove block at 'filepos' */
|
2007-04-04 22:37:09 +02:00
|
|
|
if ((b_type= _ma_get_block_info(&block_info, info->dfile.file, filepos))
|
2006-04-11 15:45:10 +02:00
|
|
|
& (BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR |
|
|
|
|
BLOCK_FATAL_ERROR) ||
|
|
|
|
(length=(uint) (block_info.filepos-filepos) +block_info.block_len) <
|
|
|
|
MARIA_MIN_BLOCK_LENGTH)
|
|
|
|
{
|
|
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
/* Check if next block is a delete block */
|
|
|
|
del_block.second_read=0;
|
|
|
|
remove_next_block=0;
|
2007-04-04 22:37:09 +02:00
|
|
|
if (_ma_get_block_info(&del_block, info->dfile.file, filepos + length) &
|
2007-01-18 20:38:14 +01:00
|
|
|
BLOCK_DELETED && del_block.block_len+length <
|
|
|
|
MARIA_DYN_MAX_BLOCK_LENGTH)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
/* We can't remove this yet as this block may be the head block */
|
|
|
|
remove_next_block=1;
|
|
|
|
length+=del_block.block_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
block_info.header[0]=0;
|
|
|
|
mi_int3store(block_info.header+1,length);
|
|
|
|
mi_sizestore(block_info.header+4,info->s->state.dellink);
|
|
|
|
if (b_type & BLOCK_LAST)
|
|
|
|
bfill(block_info.header+12,8,255);
|
|
|
|
else
|
|
|
|
mi_sizestore(block_info.header+12,block_info.next_filepos);
|
|
|
|
if (info->s->file_write(info,(byte*) block_info.header,20,filepos,
|
|
|
|
MYF(MY_NABP)))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
info->s->state.dellink = filepos;
|
|
|
|
info->state->del++;
|
|
|
|
info->state->empty+=length;
|
|
|
|
filepos=block_info.next_filepos;
|
|
|
|
|
|
|
|
/* Now it's safe to unlink the deleted block directly after this one */
|
|
|
|
if (remove_next_block && unlink_deleted_block(info,&del_block))
|
|
|
|
error=1;
|
|
|
|
} while (!(b_type & BLOCK_LAST));
|
|
|
|
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Write a block to datafile */
|
|
|
|
|
|
|
|
int _ma_write_part_record(MARIA_HA *info,
|
|
|
|
my_off_t filepos, /* points at empty block */
|
|
|
|
ulong length, /* length of block */
|
|
|
|
my_off_t next_filepos,/* Next empty block */
|
|
|
|
byte **record, /* pointer to record ptr */
|
|
|
|
ulong *reclength, /* length of *record */
|
|
|
|
int *flag) /* *flag == 0 if header */
|
|
|
|
{
|
|
|
|
ulong head_length,res_length,extra_length,long_block,del_length;
|
|
|
|
byte *pos,*record_end;
|
|
|
|
my_off_t next_delete_block;
|
|
|
|
uchar temp[MARIA_SPLIT_LENGTH+MARIA_DYN_DELETE_BLOCK_HEADER];
|
|
|
|
DBUG_ENTER("_ma_write_part_record");
|
|
|
|
|
|
|
|
next_delete_block=HA_OFFSET_ERROR;
|
|
|
|
|
|
|
|
res_length=extra_length=0;
|
|
|
|
if (length > *reclength + MARIA_SPLIT_LENGTH)
|
|
|
|
{ /* Splitt big block */
|
|
|
|
res_length=MY_ALIGN(length- *reclength - MARIA_EXTEND_BLOCK_LENGTH,
|
|
|
|
MARIA_DYN_ALIGN_SIZE);
|
|
|
|
length-= res_length; /* Use this for first part */
|
|
|
|
}
|
|
|
|
long_block= (length < 65520L && *reclength < 65520L) ? 0 : 1;
|
|
|
|
if (length == *reclength+ 3 + long_block)
|
|
|
|
{
|
|
|
|
/* Block is exactly of the right length */
|
|
|
|
temp[0]=(uchar) (1+ *flag)+(uchar) long_block; /* Flag is 0 or 6 */
|
|
|
|
if (long_block)
|
|
|
|
{
|
|
|
|
mi_int3store(temp+1,*reclength);
|
|
|
|
head_length=4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mi_int2store(temp+1,*reclength);
|
|
|
|
head_length=3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (length-long_block < *reclength+4)
|
|
|
|
{ /* To short block */
|
|
|
|
if (next_filepos == HA_OFFSET_ERROR)
|
|
|
|
next_filepos= (info->s->state.dellink != HA_OFFSET_ERROR &&
|
|
|
|
!info->append_insert_at_end ?
|
|
|
|
info->s->state.dellink : info->state->data_file_length);
|
|
|
|
if (*flag == 0) /* First block */
|
|
|
|
{
|
|
|
|
if (*reclength > MARIA_MAX_BLOCK_LENGTH)
|
|
|
|
{
|
|
|
|
head_length= 16;
|
|
|
|
temp[0]=13;
|
|
|
|
mi_int4store(temp+1,*reclength);
|
|
|
|
mi_int3store(temp+5,length-head_length);
|
|
|
|
mi_sizestore((byte*) temp+8,next_filepos);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
head_length=5+8+long_block*2;
|
|
|
|
temp[0]=5+(uchar) long_block;
|
|
|
|
if (long_block)
|
|
|
|
{
|
|
|
|
mi_int3store(temp+1,*reclength);
|
|
|
|
mi_int3store(temp+4,length-head_length);
|
|
|
|
mi_sizestore((byte*) temp+7,next_filepos);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mi_int2store(temp+1,*reclength);
|
|
|
|
mi_int2store(temp+3,length-head_length);
|
|
|
|
mi_sizestore((byte*) temp+5,next_filepos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
head_length=3+8+long_block;
|
|
|
|
temp[0]=11+(uchar) long_block;
|
|
|
|
if (long_block)
|
|
|
|
{
|
|
|
|
mi_int3store(temp+1,length-head_length);
|
|
|
|
mi_sizestore((byte*) temp+4,next_filepos);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mi_int2store(temp+1,length-head_length);
|
|
|
|
mi_sizestore((byte*) temp+3,next_filepos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ /* Block with empty info last */
|
|
|
|
head_length=4+long_block;
|
|
|
|
extra_length= length- *reclength-head_length;
|
|
|
|
temp[0]= (uchar) (3+ *flag)+(uchar) long_block; /* 3,4 or 9,10 */
|
|
|
|
if (long_block)
|
|
|
|
{
|
|
|
|
mi_int3store(temp+1,*reclength);
|
|
|
|
temp[4]= (uchar) (extra_length);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mi_int2store(temp+1,*reclength);
|
|
|
|
temp[3]= (uchar) (extra_length);
|
|
|
|
}
|
|
|
|
length= *reclength+head_length; /* Write only what is needed */
|
|
|
|
}
|
|
|
|
DBUG_DUMP("header",(byte*) temp,head_length);
|
|
|
|
|
|
|
|
/* Make a long block for one write */
|
|
|
|
record_end= *record+length-head_length;
|
|
|
|
del_length=(res_length ? MARIA_DYN_DELETE_BLOCK_HEADER : 0);
|
|
|
|
bmove((byte*) (*record-head_length),(byte*) temp,head_length);
|
|
|
|
memcpy(temp,record_end,(size_t) (extra_length+del_length));
|
|
|
|
bzero((byte*) record_end,extra_length);
|
|
|
|
|
|
|
|
if (res_length)
|
|
|
|
{
|
|
|
|
/* Check first if we can join this block with the next one */
|
|
|
|
MARIA_BLOCK_INFO del_block;
|
|
|
|
my_off_t next_block=filepos+length+extra_length+res_length;
|
|
|
|
|
|
|
|
del_block.second_read=0;
|
|
|
|
if (next_block < info->state->data_file_length &&
|
|
|
|
info->s->state.dellink != HA_OFFSET_ERROR)
|
|
|
|
{
|
2007-04-04 22:37:09 +02:00
|
|
|
if ((_ma_get_block_info(&del_block, info->dfile.file, next_block)
|
2006-04-11 15:45:10 +02:00
|
|
|
& BLOCK_DELETED) &&
|
|
|
|
res_length + del_block.block_len < MARIA_DYN_MAX_BLOCK_LENGTH)
|
|
|
|
{
|
|
|
|
if (unlink_deleted_block(info,&del_block))
|
|
|
|
goto err;
|
|
|
|
res_length+=del_block.block_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create a delete link of the last part of the block */
|
|
|
|
pos=record_end+extra_length;
|
|
|
|
pos[0]= '\0';
|
|
|
|
mi_int3store(pos+1,res_length);
|
|
|
|
mi_sizestore(pos+4,info->s->state.dellink);
|
|
|
|
bfill(pos+12,8,255); /* End link */
|
|
|
|
next_delete_block=info->s->state.dellink;
|
|
|
|
info->s->state.dellink= filepos+length+extra_length;
|
|
|
|
info->state->del++;
|
|
|
|
info->state->empty+=res_length;
|
|
|
|
info->s->state.split++;
|
|
|
|
}
|
|
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
|
|
|
info->update & HA_STATE_WRITE_AT_END)
|
|
|
|
{
|
|
|
|
if (info->update & HA_STATE_EXTEND_BLOCK)
|
|
|
|
{
|
|
|
|
info->update&= ~HA_STATE_EXTEND_BLOCK;
|
|
|
|
if (my_block_write(&info->rec_cache,(byte*) *record-head_length,
|
|
|
|
length+extra_length+del_length,filepos))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else if (my_b_write(&info->rec_cache,(byte*) *record-head_length,
|
|
|
|
length+extra_length+del_length))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
info->rec_cache.seek_not_done=1;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (info->s->file_write(info,(byte*) *record-head_length,
|
|
|
|
length+extra_length+
|
|
|
|
del_length,filepos,info->s->write_flag))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
memcpy(record_end,temp,(size_t) (extra_length+del_length));
|
|
|
|
*record=record_end;
|
|
|
|
*reclength-=(length-head_length);
|
|
|
|
*flag=6;
|
|
|
|
|
|
|
|
if (del_length)
|
|
|
|
{
|
|
|
|
/* link the next delete block to this */
|
|
|
|
if (update_backward_delete_link(info, next_delete_block,
|
|
|
|
info->s->state.dellink))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
|
|
DBUG_PRINT("exit",("errno: %d",my_errno));
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
} /* _ma_write_part_record */
|
|
|
|
|
|
|
|
|
|
|
|
/* update record from datafile */
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static my_bool update_dynamic_record(MARIA_HA *info, MARIA_RECORD_POS filepos,
|
|
|
|
byte *record, ulong reclength)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
int flag;
|
|
|
|
uint error;
|
|
|
|
ulong length;
|
|
|
|
MARIA_BLOCK_INFO block_info;
|
|
|
|
DBUG_ENTER("update_dynamic_record");
|
|
|
|
|
|
|
|
flag=block_info.second_read=0;
|
|
|
|
while (reclength > 0)
|
|
|
|
{
|
|
|
|
if (filepos != info->s->state.dellink)
|
|
|
|
{
|
|
|
|
block_info.next_filepos= HA_OFFSET_ERROR;
|
2007-04-04 22:37:09 +02:00
|
|
|
if ((error= _ma_get_block_info(&block_info, info->dfile.file, filepos))
|
2006-04-11 15:45:10 +02:00
|
|
|
& (BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR |
|
|
|
|
BLOCK_FATAL_ERROR))
|
|
|
|
{
|
|
|
|
DBUG_PRINT("error",("Got wrong block info"));
|
|
|
|
if (!(error & BLOCK_FATAL_ERROR))
|
|
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
length=(ulong) (block_info.filepos-filepos) + block_info.block_len;
|
|
|
|
if (length < reclength)
|
|
|
|
{
|
|
|
|
uint tmp=MY_ALIGN(reclength - length + 3 +
|
|
|
|
test(reclength >= 65520L),MARIA_DYN_ALIGN_SIZE);
|
|
|
|
/* Don't create a block bigger than MARIA_MAX_BLOCK_LENGTH */
|
|
|
|
tmp= min(length+tmp, MARIA_MAX_BLOCK_LENGTH)-length;
|
|
|
|
/* Check if we can extend this block */
|
|
|
|
if (block_info.filepos + block_info.block_len ==
|
|
|
|
info->state->data_file_length &&
|
|
|
|
info->state->data_file_length <
|
|
|
|
info->s->base.max_data_file_length-tmp)
|
|
|
|
{
|
|
|
|
/* extend file */
|
|
|
|
DBUG_PRINT("info",("Extending file with %d bytes",tmp));
|
2007-01-18 20:38:14 +01:00
|
|
|
if (info->cur_row.nextpos == info->state->data_file_length)
|
|
|
|
info->cur_row.nextpos+= tmp;
|
2006-04-11 15:45:10 +02:00
|
|
|
info->state->data_file_length+= tmp;
|
|
|
|
info->update|= HA_STATE_WRITE_AT_END | HA_STATE_EXTEND_BLOCK;
|
|
|
|
length+=tmp;
|
|
|
|
}
|
|
|
|
else if (length < MARIA_MAX_BLOCK_LENGTH - MARIA_MIN_BLOCK_LENGTH)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Check if next block is a deleted block
|
|
|
|
Above we have MARIA_MIN_BLOCK_LENGTH to avoid the problem where
|
|
|
|
the next block is so small it can't be splited which could
|
|
|
|
casue problems
|
|
|
|
*/
|
|
|
|
|
|
|
|
MARIA_BLOCK_INFO del_block;
|
|
|
|
del_block.second_read=0;
|
2007-04-04 22:37:09 +02:00
|
|
|
if (_ma_get_block_info(&del_block, info->dfile.file,
|
2006-04-11 15:45:10 +02:00
|
|
|
block_info.filepos + block_info.block_len) &
|
|
|
|
BLOCK_DELETED)
|
|
|
|
{
|
|
|
|
/* Use; Unlink it and extend the current block */
|
|
|
|
DBUG_PRINT("info",("Extending current block"));
|
|
|
|
if (unlink_deleted_block(info,&del_block))
|
|
|
|
goto err;
|
|
|
|
if ((length+=del_block.block_len) > MARIA_MAX_BLOCK_LENGTH)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
New block was too big, link overflow part back to
|
|
|
|
delete list
|
|
|
|
*/
|
|
|
|
my_off_t next_pos;
|
|
|
|
ulong rest_length= length-MARIA_MAX_BLOCK_LENGTH;
|
|
|
|
set_if_bigger(rest_length, MARIA_MIN_BLOCK_LENGTH);
|
|
|
|
next_pos= del_block.filepos+ del_block.block_len - rest_length;
|
|
|
|
|
|
|
|
if (update_backward_delete_link(info, info->s->state.dellink,
|
|
|
|
next_pos))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
/* create delete link for data that didn't fit into the page */
|
|
|
|
del_block.header[0]=0;
|
|
|
|
mi_int3store(del_block.header+1, rest_length);
|
|
|
|
mi_sizestore(del_block.header+4,info->s->state.dellink);
|
|
|
|
bfill(del_block.header+12,8,255);
|
2007-01-18 20:38:14 +01:00
|
|
|
if (info->s->file_write(info,(byte*) del_block.header, 20,
|
|
|
|
next_pos, MYF(MY_NABP)))
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
info->s->state.dellink= next_pos;
|
|
|
|
info->s->state.split++;
|
|
|
|
info->state->del++;
|
|
|
|
info->state->empty+= rest_length;
|
|
|
|
length-= rest_length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (_ma_find_writepos(info,reclength,&filepos,&length))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (_ma_write_part_record(info,filepos,length,block_info.next_filepos,
|
|
|
|
&record,&reclength,&flag))
|
|
|
|
goto err;
|
|
|
|
if ((filepos=block_info.next_filepos) == HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
/* Start writing data on deleted blocks */
|
|
|
|
filepos=info->s->state.dellink;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (block_info.next_filepos != HA_OFFSET_ERROR)
|
|
|
|
if (delete_dynamic_record(info,block_info.next_filepos,1))
|
|
|
|
goto err;
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Pack a record. Return new reclength */
|
|
|
|
|
|
|
|
uint _ma_rec_pack(MARIA_HA *info, register byte *to, register const byte *from)
|
|
|
|
{
|
|
|
|
uint length,new_length,flag,bit,i;
|
|
|
|
char *pos,*end,*startpos,*packpos;
|
|
|
|
enum en_fieldtype type;
|
2007-04-19 12:18:56 +02:00
|
|
|
reg3 MARIA_COLUMNDEF *column;
|
2006-04-11 15:45:10 +02:00
|
|
|
MARIA_BLOB *blob;
|
|
|
|
DBUG_ENTER("_ma_rec_pack");
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
flag= 0;
|
|
|
|
bit= 1;
|
|
|
|
startpos= packpos=to;
|
|
|
|
to+= info->s->base.pack_bytes;
|
|
|
|
blob= info->blobs;
|
2007-04-19 12:18:56 +02:00
|
|
|
column= info->s->columndef;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (info->s->base.null_bytes)
|
|
|
|
{
|
|
|
|
memcpy(to, from, info->s->base.null_bytes);
|
|
|
|
from+= info->s->base.null_bytes;
|
|
|
|
to+= info->s->base.null_bytes;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-04-19 12:18:56 +02:00
|
|
|
for (i=info->s->base.fields ; i-- > 0; from+= length, column++)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
length=(uint) column->length;
|
|
|
|
if ((type = (enum en_fieldtype) column->type) != FIELD_NORMAL)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (type == FIELD_BLOB)
|
|
|
|
{
|
|
|
|
if (!blob->length)
|
|
|
|
flag|=bit;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *temp_pos;
|
2007-04-19 12:18:56 +02:00
|
|
|
size_t tmp_length=length-portable_sizeof_char_ptr;
|
2006-04-11 15:45:10 +02:00
|
|
|
memcpy((byte*) to,from,tmp_length);
|
|
|
|
memcpy_fixed(&temp_pos,from+tmp_length,sizeof(char*));
|
|
|
|
memcpy(to+tmp_length,temp_pos,(size_t) blob->length);
|
|
|
|
to+=tmp_length+blob->length;
|
|
|
|
}
|
|
|
|
blob++;
|
|
|
|
}
|
|
|
|
else if (type == FIELD_SKIP_ZERO)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if (memcmp((byte*) from, maria_zero_string, length) == 0)
|
2006-04-11 15:45:10 +02:00
|
|
|
flag|=bit;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy((byte*) to,from,(size_t) length); to+=length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (type == FIELD_SKIP_ENDSPACE ||
|
|
|
|
type == FIELD_SKIP_PRESPACE)
|
|
|
|
{
|
|
|
|
pos= (byte*) from; end= (byte*) from + length;
|
|
|
|
if (type == FIELD_SKIP_ENDSPACE)
|
|
|
|
{ /* Pack trailing spaces */
|
|
|
|
while (end > from && *(end-1) == ' ')
|
|
|
|
end--;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ /* Pack pref-spaces */
|
|
|
|
while (pos < end && *pos == ' ')
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
new_length=(uint) (end-pos);
|
2007-04-19 12:18:56 +02:00
|
|
|
if (new_length +1 + test(column->length > 255 && new_length > 127)
|
2006-04-11 15:45:10 +02:00
|
|
|
< length)
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
if (column->length > 255 && new_length > 127)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
to[0]=(char) ((new_length & 127)+128);
|
|
|
|
to[1]=(char) (new_length >> 7);
|
|
|
|
to+=2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*to++= (char) new_length;
|
|
|
|
memcpy((byte*) to,pos,(size_t) new_length); to+=new_length;
|
|
|
|
flag|=bit;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy(to,from,(size_t) length); to+=length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (type == FIELD_VARCHAR)
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
uint pack_length= HA_VARCHAR_PACKLENGTH(column->length -1);
|
2006-04-11 15:45:10 +02:00
|
|
|
uint tmp_length;
|
|
|
|
if (pack_length == 1)
|
|
|
|
{
|
|
|
|
tmp_length= (uint) *(uchar*) from;
|
|
|
|
*to++= *from;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tmp_length= uint2korr(from);
|
|
|
|
store_key_length_inc(to,tmp_length);
|
|
|
|
}
|
|
|
|
memcpy(to, from+pack_length,tmp_length);
|
|
|
|
to+= tmp_length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy(to,from,(size_t) length); to+=length;
|
|
|
|
continue; /* Normal field */
|
|
|
|
}
|
|
|
|
if ((bit= bit << 1) >= 256)
|
|
|
|
{
|
|
|
|
*packpos++ = (char) (uchar) flag;
|
|
|
|
bit=1; flag=0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy(to,from,(size_t) length); to+=length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (bit != 1)
|
|
|
|
*packpos= (char) (uchar) flag;
|
|
|
|
if (info->s->calc_checksum)
|
2007-01-18 20:38:14 +01:00
|
|
|
*to++= (byte) info->cur_row.checksum;
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_PRINT("exit",("packed length: %d",(int) (to-startpos)));
|
|
|
|
DBUG_RETURN((uint) (to-startpos));
|
|
|
|
} /* _ma_rec_pack */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2007-01-18 20:38:14 +01:00
|
|
|
Check if a record was correctly packed. Used only by maria_chk
|
2006-04-11 15:45:10 +02:00
|
|
|
Returns 0 if record is ok.
|
|
|
|
*/
|
|
|
|
|
|
|
|
my_bool _ma_rec_check(MARIA_HA *info,const char *record, byte *rec_buff,
|
|
|
|
ulong packed_length, my_bool with_checksum)
|
|
|
|
{
|
|
|
|
uint length,new_length,flag,bit,i;
|
|
|
|
char *pos,*end,*packpos,*to;
|
|
|
|
enum en_fieldtype type;
|
2007-04-19 12:18:56 +02:00
|
|
|
reg3 MARIA_COLUMNDEF *column;
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_ENTER("_ma_rec_check");
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
packpos=rec_buff; to= rec_buff+info->s->base.pack_bytes;
|
2007-04-19 12:18:56 +02:00
|
|
|
column= info->s->columndef;
|
2006-04-11 15:45:10 +02:00
|
|
|
flag= *packpos; bit=1;
|
2007-01-18 20:38:14 +01:00
|
|
|
record+= info->s->base.null_bytes;
|
|
|
|
to+= info->s->base.null_bytes;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-04-19 12:18:56 +02:00
|
|
|
for (i=info->s->base.fields ; i-- > 0; record+= length, column++)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
length=(uint) column->length;
|
|
|
|
if ((type = (enum en_fieldtype) column->type) != FIELD_NORMAL)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (type == FIELD_BLOB)
|
|
|
|
{
|
|
|
|
uint blob_length=
|
2007-04-19 12:18:56 +02:00
|
|
|
_ma_calc_blob_length(length-portable_sizeof_char_ptr,record);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (!blob_length && !(flag & bit))
|
|
|
|
goto err;
|
|
|
|
if (blob_length)
|
2007-04-19 12:18:56 +02:00
|
|
|
to+=length - portable_sizeof_char_ptr+ blob_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else if (type == FIELD_SKIP_ZERO)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if (memcmp((byte*) record, maria_zero_string, length) == 0)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (!(flag & bit))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
to+=length;
|
|
|
|
}
|
|
|
|
else if (type == FIELD_SKIP_ENDSPACE ||
|
|
|
|
type == FIELD_SKIP_PRESPACE)
|
|
|
|
{
|
|
|
|
pos= (byte*) record; end= (byte*) record + length;
|
|
|
|
if (type == FIELD_SKIP_ENDSPACE)
|
|
|
|
{ /* Pack trailing spaces */
|
|
|
|
while (end > record && *(end-1) == ' ')
|
|
|
|
end--;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ /* Pack pre-spaces */
|
|
|
|
while (pos < end && *pos == ' ')
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
new_length=(uint) (end-pos);
|
2007-04-19 12:18:56 +02:00
|
|
|
if (new_length +1 + test(column->length > 255 && new_length > 127)
|
2006-04-11 15:45:10 +02:00
|
|
|
< length)
|
|
|
|
{
|
|
|
|
if (!(flag & bit))
|
|
|
|
goto err;
|
2007-04-19 12:18:56 +02:00
|
|
|
if (column->length > 255 && new_length > 127)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (to[0] != (char) ((new_length & 127)+128) ||
|
|
|
|
to[1] != (char) (new_length >> 7))
|
|
|
|
goto err;
|
|
|
|
to+=2;
|
|
|
|
}
|
|
|
|
else if (*to++ != (char) new_length)
|
|
|
|
goto err;
|
|
|
|
to+=new_length;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
to+=length;
|
|
|
|
}
|
|
|
|
else if (type == FIELD_VARCHAR)
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
uint pack_length= HA_VARCHAR_PACKLENGTH(column->length -1);
|
2006-04-11 15:45:10 +02:00
|
|
|
uint tmp_length;
|
|
|
|
if (pack_length == 1)
|
|
|
|
{
|
|
|
|
tmp_length= (uint) *(uchar*) record;
|
|
|
|
to+= 1+ tmp_length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tmp_length= uint2korr(record);
|
|
|
|
to+= get_pack_length(tmp_length)+tmp_length;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
to+=length;
|
|
|
|
continue; /* Normal field */
|
|
|
|
}
|
|
|
|
if ((bit= bit << 1) >= 256)
|
|
|
|
{
|
|
|
|
flag= *++packpos;
|
|
|
|
bit=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
to+= length;
|
|
|
|
}
|
|
|
|
if (packed_length != (uint) (to - rec_buff) + test(info->s->calc_checksum) ||
|
|
|
|
(bit != 1 && (flag & ~(bit - 1))))
|
|
|
|
goto err;
|
2007-01-18 20:38:14 +01:00
|
|
|
if (with_checksum && ((uchar) info->cur_row.checksum != (uchar) *to))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
DBUG_PRINT("error",("wrong checksum for row"));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
err:
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Unpacks a record */
|
|
|
|
/* Returns -1 and my_errno =HA_ERR_RECORD_DELETED if reclength isn't */
|
|
|
|
/* right. Returns reclength (>0) if ok */
|
|
|
|
|
|
|
|
ulong _ma_rec_unpack(register MARIA_HA *info, register byte *to, byte *from,
|
|
|
|
ulong found_length)
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
uint flag,bit,length,min_pack_length, column_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
enum en_fieldtype type;
|
|
|
|
byte *from_end,*to_end,*packpos;
|
2007-04-19 12:18:56 +02:00
|
|
|
reg3 MARIA_COLUMNDEF *column, *end_column;
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_ENTER("_ma_rec_unpack");
|
|
|
|
|
|
|
|
to_end=to + info->s->base.reclength;
|
|
|
|
from_end=from+found_length;
|
|
|
|
flag= (uchar) *from; bit=1; packpos=from;
|
|
|
|
if (found_length < info->s->base.min_pack_length)
|
|
|
|
goto err;
|
2007-01-18 20:38:14 +01:00
|
|
|
from+= info->s->base.pack_bytes;
|
|
|
|
min_pack_length= info->s->base.min_pack_length - info->s->base.pack_bytes;
|
|
|
|
|
|
|
|
if ((length= info->s->base.null_bytes))
|
|
|
|
{
|
|
|
|
memcpy(to, from, length);
|
|
|
|
from+= length;
|
|
|
|
to+= length;
|
|
|
|
min_pack_length-= length;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-04-19 12:18:56 +02:00
|
|
|
for (column= info->s->columndef, end_column= column + info->s->base.fields;
|
|
|
|
column < end_column ; to+= column_length, column++)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
column_length= column->length;
|
|
|
|
if ((type = (enum en_fieldtype) column->type) != FIELD_NORMAL &&
|
2006-04-11 15:45:10 +02:00
|
|
|
(type != FIELD_CHECK))
|
|
|
|
{
|
|
|
|
if (type == FIELD_VARCHAR)
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
uint pack_length= HA_VARCHAR_PACKLENGTH(column_length-1);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (pack_length == 1)
|
|
|
|
{
|
|
|
|
length= (uint) *(uchar*) from;
|
2007-04-19 12:18:56 +02:00
|
|
|
if (length > column_length-1)
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
*to= *from++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
get_key_length(length, from);
|
2007-04-19 12:18:56 +02:00
|
|
|
if (length > column_length-2)
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
int2store(to,length);
|
|
|
|
}
|
|
|
|
if (from+length > from_end)
|
|
|
|
goto err;
|
|
|
|
memcpy(to+pack_length, from, length);
|
|
|
|
from+= length;
|
|
|
|
min_pack_length--;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (flag & bit)
|
|
|
|
{
|
|
|
|
if (type == FIELD_BLOB || type == FIELD_SKIP_ZERO)
|
2007-04-19 12:18:56 +02:00
|
|
|
bzero((byte*) to,column_length);
|
2006-04-11 15:45:10 +02:00
|
|
|
else if (type == FIELD_SKIP_ENDSPACE ||
|
|
|
|
type == FIELD_SKIP_PRESPACE)
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
if (column->length > 255 && *from & 128)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (from + 1 >= from_end)
|
|
|
|
goto err;
|
|
|
|
length= (*from & 127)+ ((uint) (uchar) *(from+1) << 7); from+=2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (from == from_end)
|
|
|
|
goto err;
|
|
|
|
length= (uchar) *from++;
|
|
|
|
}
|
|
|
|
min_pack_length--;
|
2007-04-19 12:18:56 +02:00
|
|
|
if (length >= column_length ||
|
2006-04-11 15:45:10 +02:00
|
|
|
min_pack_length + length > (uint) (from_end - from))
|
|
|
|
goto err;
|
|
|
|
if (type == FIELD_SKIP_ENDSPACE)
|
|
|
|
{
|
|
|
|
memcpy(to,(byte*) from,(size_t) length);
|
2007-04-19 12:18:56 +02:00
|
|
|
bfill((byte*) to+length,column_length-length,' ');
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
bfill((byte*) to,column_length-length,' ');
|
|
|
|
memcpy(to+column_length-length,(byte*) from,(size_t) length);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
from+=length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (type == FIELD_BLOB)
|
|
|
|
{
|
2007-04-19 12:18:56 +02:00
|
|
|
uint size_length=column_length- portable_sizeof_char_ptr;
|
2006-04-11 15:45:10 +02:00
|
|
|
ulong blob_length= _ma_calc_blob_length(size_length,from);
|
2007-03-01 18:23:58 +01:00
|
|
|
ulong from_left= (ulong) (from_end - from);
|
|
|
|
if (from_left < size_length ||
|
|
|
|
from_left - size_length < blob_length ||
|
|
|
|
from_left - size_length - blob_length < min_pack_length)
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
memcpy((byte*) to,(byte*) from,(size_t) size_length);
|
|
|
|
from+=size_length;
|
|
|
|
memcpy_fixed((byte*) to+size_length,(byte*) &from,sizeof(char*));
|
|
|
|
from+=blob_length;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (type == FIELD_SKIP_ENDSPACE || type == FIELD_SKIP_PRESPACE)
|
|
|
|
min_pack_length--;
|
2007-04-19 12:18:56 +02:00
|
|
|
if (min_pack_length + column_length > (uint) (from_end - from))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
2007-04-19 12:18:56 +02:00
|
|
|
memcpy(to,(byte*) from,(size_t) column_length); from+=column_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
if ((bit= bit << 1) >= 256)
|
|
|
|
{
|
|
|
|
flag= (uchar) *++packpos; bit=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (min_pack_length > (uint) (from_end - from))
|
|
|
|
goto err;
|
2007-04-19 12:18:56 +02:00
|
|
|
min_pack_length-=column_length;
|
|
|
|
memcpy(to, (byte*) from, (size_t) column_length);
|
|
|
|
from+=column_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (info->s->calc_checksum)
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.checksum= (uint) (uchar) *from++;
|
2006-04-11 15:45:10 +02:00
|
|
|
if (to == to_end && from == from_end && (bit == 1 || !(flag & ~(bit-1))))
|
|
|
|
DBUG_RETURN(found_length);
|
|
|
|
|
|
|
|
err:
|
|
|
|
my_errno= HA_ERR_WRONG_IN_RECORD;
|
2006-12-20 18:58:35 +01:00
|
|
|
DBUG_PRINT("error",("to_end: 0x%lx -> 0x%lx from_end: 0x%lx -> 0x%lx",
|
|
|
|
(long) to, (long) to_end, (long) from, (long) from_end));
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_DUMP("from",(byte*) info->rec_buff,info->s->base.min_pack_length);
|
|
|
|
DBUG_RETURN(MY_FILE_ERROR);
|
|
|
|
} /* _ma_rec_unpack */
|
|
|
|
|
|
|
|
|
|
|
|
/* Calc length of blob. Update info in blobs->length */
|
|
|
|
|
|
|
|
ulong _ma_calc_total_blob_length(MARIA_HA *info, const byte *record)
|
|
|
|
{
|
|
|
|
ulong length;
|
|
|
|
MARIA_BLOB *blob,*end;
|
|
|
|
|
|
|
|
for (length=0, blob= info->blobs, end=blob+info->s->base.blobs ;
|
|
|
|
blob != end;
|
|
|
|
blob++)
|
|
|
|
{
|
|
|
|
blob->length= _ma_calc_blob_length(blob->pack_length,record + blob->offset);
|
|
|
|
length+=blob->length;
|
|
|
|
}
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ulong _ma_calc_blob_length(uint length, const byte *pos)
|
|
|
|
{
|
|
|
|
switch (length) {
|
|
|
|
case 1:
|
|
|
|
return (uint) (uchar) *pos;
|
|
|
|
case 2:
|
|
|
|
return (uint) uint2korr(pos);
|
|
|
|
case 3:
|
|
|
|
return uint3korr(pos);
|
|
|
|
case 4:
|
|
|
|
return uint4korr(pos);
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return 0; /* Impossible */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void _ma_store_blob_length(byte *pos,uint pack_length,uint length)
|
|
|
|
{
|
|
|
|
switch (pack_length) {
|
|
|
|
case 1:
|
|
|
|
*pos= (uchar) length;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
int2store(pos,length);
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
int3store(pos,length);
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
int4store(pos,length);
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-09-07 17:07:17 +02:00
|
|
|
/*
|
|
|
|
Read record from datafile.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_read_dynamic_record()
|
|
|
|
info MARIA_HA pointer to table.
|
|
|
|
filepos From where to read the record.
|
|
|
|
buf Destination for record.
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
If a write buffer is active, it needs to be flushed if its contents
|
|
|
|
intersects with the record to read. We always check if the position
|
|
|
|
of the first byte of the write buffer is lower than the position
|
|
|
|
past the last byte to read. In theory this is also true if the write
|
|
|
|
buffer is completely below the read segment. That is, if there is no
|
|
|
|
intersection. But this case is unusual. We flush anyway. Only if the
|
|
|
|
first byte in the write buffer is above the last byte to read, we do
|
|
|
|
not flush.
|
|
|
|
|
|
|
|
A dynamic record may need several reads. So this check must be done
|
|
|
|
before every read. Reading a dynamic record starts with reading the
|
|
|
|
block header. If the record does not fit into the free space of the
|
|
|
|
header, the block may be longer than the header. In this case a
|
|
|
|
second read is necessary. These one or two reads repeat for every
|
|
|
|
part of the record.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 OK
|
2007-01-23 20:13:26 +01:00
|
|
|
1 Error
|
2006-09-07 17:07:17 +02:00
|
|
|
*/
|
2007-01-18 20:38:14 +01:00
|
|
|
int _ma_read_dynamic_record(MARIA_HA *info, byte *buf,
|
|
|
|
MARIA_RECORD_POS filepos)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2006-09-07 17:07:17 +02:00
|
|
|
int block_of_record;
|
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
|
|
|
uint b_type;
|
2006-04-11 15:45:10 +02:00
|
|
|
MARIA_BLOCK_INFO block_info;
|
|
|
|
File file;
|
2007-01-18 20:38:14 +01:00
|
|
|
DBUG_ENTER("_ma_read_dynamic_record");
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if (filepos != HA_OFFSET_ERROR)
|
|
|
|
{
|
2007-04-19 17:48:36 +02:00
|
|
|
byte *to;
|
|
|
|
uint left_length;
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
LINT_INIT(to);
|
|
|
|
LINT_INIT(left_length);
|
2007-04-04 22:37:09 +02:00
|
|
|
file= info->dfile.file;
|
2006-09-07 17:07:17 +02:00
|
|
|
block_of_record= 0; /* First block of record is numbered as zero. */
|
|
|
|
block_info.second_read= 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
do
|
2006-09-07 17:07:17 +02:00
|
|
|
{
|
|
|
|
/* A corrupted table can have wrong pointers. (Bug# 19835) */
|
|
|
|
if (filepos == HA_OFFSET_ERROR)
|
|
|
|
goto panic;
|
2006-04-11 15:45:10 +02:00
|
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
2007-04-19 17:48:36 +02:00
|
|
|
(info->rec_cache.pos_in_file < filepos +
|
|
|
|
MARIA_BLOCK_INFO_HEADER_LENGTH) &&
|
2006-04-11 15:45:10 +02:00
|
|
|
flush_io_cache(&info->rec_cache))
|
|
|
|
goto err;
|
|
|
|
info->rec_cache.seek_not_done=1;
|
2007-04-19 17:48:36 +02:00
|
|
|
if ((b_type= _ma_get_block_info(&block_info, file, filepos)) &
|
|
|
|
(BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR |
|
|
|
|
BLOCK_FATAL_ERROR))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (b_type & (BLOCK_SYNC_ERROR | BLOCK_DELETED))
|
|
|
|
my_errno=HA_ERR_RECORD_DELETED;
|
|
|
|
goto err;
|
|
|
|
}
|
2006-09-07 17:07:17 +02:00
|
|
|
if (block_of_record++ == 0) /* First block */
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (block_info.rec_len > (uint) info->s->base.max_pack_length)
|
|
|
|
goto panic;
|
|
|
|
if (info->s->base.blobs)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if (_ma_alloc_buffer(&info->rec_buff, &info->rec_buff_size,
|
|
|
|
block_info.rec_len +
|
|
|
|
info->s->base.extra_rec_buff_size))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
to= info->rec_buff;
|
2006-04-11 15:45:10 +02:00
|
|
|
left_length=block_info.rec_len;
|
|
|
|
}
|
|
|
|
if (left_length < block_info.data_len || ! block_info.data_len)
|
|
|
|
goto panic; /* Wrong linked record */
|
2006-09-07 17:07:17 +02:00
|
|
|
/* copy information that is already read */
|
|
|
|
{
|
|
|
|
uint offset= (uint) (block_info.filepos - filepos);
|
|
|
|
uint prefetch_len= (sizeof(block_info.header) - offset);
|
|
|
|
filepos+= sizeof(block_info.header);
|
|
|
|
|
|
|
|
if (prefetch_len > block_info.data_len)
|
|
|
|
prefetch_len= block_info.data_len;
|
|
|
|
if (prefetch_len)
|
|
|
|
{
|
|
|
|
memcpy((byte*) to, block_info.header + offset, prefetch_len);
|
|
|
|
block_info.data_len-= prefetch_len;
|
|
|
|
left_length-= prefetch_len;
|
|
|
|
to+= prefetch_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* read rest of record from file */
|
|
|
|
if (block_info.data_len)
|
|
|
|
{
|
|
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
|
|
|
info->rec_cache.pos_in_file < filepos + block_info.data_len &&
|
|
|
|
flush_io_cache(&info->rec_cache))
|
|
|
|
goto err;
|
|
|
|
/*
|
|
|
|
What a pity that this method is not called 'file_pread' and that
|
|
|
|
there is no equivalent without seeking. We are at the right
|
|
|
|
position already. :(
|
|
|
|
*/
|
|
|
|
if (info->s->file_read(info, (byte*) to, block_info.data_len,
|
|
|
|
filepos, MYF(MY_NABP)))
|
|
|
|
goto panic;
|
|
|
|
left_length-=block_info.data_len;
|
|
|
|
to+=block_info.data_len;
|
|
|
|
}
|
|
|
|
filepos= block_info.next_filepos;
|
2006-04-11 15:45:10 +02:00
|
|
|
} while (left_length);
|
|
|
|
|
|
|
|
info->update|= HA_STATE_AKTIV; /* We have a aktive record */
|
|
|
|
fast_ma_writeinfo(info);
|
|
|
|
DBUG_RETURN(_ma_rec_unpack(info,buf,info->rec_buff,block_info.rec_len) !=
|
2007-01-18 20:38:14 +01:00
|
|
|
MY_FILE_ERROR ? 0 : 1);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
fast_ma_writeinfo(info);
|
2007-01-18 20:38:14 +01:00
|
|
|
DBUG_RETURN(1); /* Wrong data to read */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
panic:
|
|
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
|
|
err:
|
|
|
|
VOID(_ma_writeinfo(info,0));
|
2007-01-18 20:38:14 +01:00
|
|
|
DBUG_RETURN(1);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* compare unique constraint between stored rows */
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
my_bool _ma_cmp_dynamic_unique(MARIA_HA *info, MARIA_UNIQUEDEF *def,
|
|
|
|
const byte *record, MARIA_RECORD_POS pos)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
byte *old_rec_buff,*old_record;
|
|
|
|
my_off_t old_rec_buff_size;
|
|
|
|
my_bool error;
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_ENTER("_ma_cmp_dynamic_unique");
|
|
|
|
|
|
|
|
if (!(old_record=my_alloca(info->s->base.reclength)))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
/* Don't let the compare destroy blobs that may be in use */
|
2007-01-18 20:38:14 +01:00
|
|
|
old_rec_buff= info->rec_buff;
|
|
|
|
old_rec_buff_size= info->rec_buff_size;
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
if (info->s->base.blobs)
|
2007-01-18 20:38:14 +01:00
|
|
|
info->rec_buff= 0;
|
|
|
|
error= _ma_read_dynamic_record(info, old_record, pos) != 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
if (!error)
|
2007-01-18 20:38:14 +01:00
|
|
|
error=_ma_unique_comp(def, record, old_record, def->null_are_equal) != 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
if (info->s->base.blobs)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
my_free(info->rec_buff, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
info->rec_buff= old_rec_buff;
|
|
|
|
info->rec_buff_size= old_rec_buff_size;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
my_afree(old_record);
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
/* Compare of record on disk with packed record in memory */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
my_bool _ma_cmp_dynamic_record(register MARIA_HA *info,
|
|
|
|
register const byte *record)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
uint flag, reclength, b_type,cmp_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
my_off_t filepos;
|
|
|
|
byte *buffer;
|
|
|
|
MARIA_BLOCK_INFO block_info;
|
2007-01-18 20:38:14 +01:00
|
|
|
my_bool error= 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_ENTER("_ma_cmp_dynamic_record");
|
|
|
|
|
|
|
|
/* We are going to do changes; dont let anybody disturb */
|
|
|
|
dont_break(); /* Dont allow SIGHUP or SIGINT */
|
|
|
|
|
|
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
|
|
{
|
|
|
|
info->update&= ~(HA_STATE_WRITE_AT_END | HA_STATE_EXTEND_BLOCK);
|
|
|
|
if (flush_io_cache(&info->rec_cache))
|
2007-01-18 20:38:14 +01:00
|
|
|
DBUG_RETURN(1);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
info->rec_cache.seek_not_done=1;
|
|
|
|
|
|
|
|
/* If nobody have touched the database we don't have to test rec */
|
|
|
|
|
|
|
|
buffer=info->rec_buff;
|
|
|
|
if ((info->opt_flag & READ_CHECK_USED))
|
|
|
|
{ /* If check isn't disabled */
|
|
|
|
if (info->s->base.blobs)
|
|
|
|
{
|
|
|
|
if (!(buffer=(byte*) my_alloca(info->s->base.pack_reclength+
|
|
|
|
_ma_calc_total_blob_length(info,record))))
|
2007-01-18 20:38:14 +01:00
|
|
|
DBUG_RETURN(1);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
reclength= _ma_rec_pack(info,buffer,record);
|
|
|
|
record= buffer;
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
filepos= info->cur_row.lastpos;
|
2006-04-11 15:45:10 +02:00
|
|
|
flag=block_info.second_read=0;
|
|
|
|
block_info.next_filepos=filepos;
|
|
|
|
while (reclength > 0)
|
|
|
|
{
|
2007-04-04 22:37:09 +02:00
|
|
|
if ((b_type= _ma_get_block_info(&block_info, info->dfile.file,
|
2006-04-11 15:45:10 +02:00
|
|
|
block_info.next_filepos))
|
|
|
|
& (BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR |
|
|
|
|
BLOCK_FATAL_ERROR))
|
|
|
|
{
|
|
|
|
if (b_type & (BLOCK_SYNC_ERROR | BLOCK_DELETED))
|
|
|
|
my_errno=HA_ERR_RECORD_CHANGED;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (flag == 0) /* First block */
|
|
|
|
{
|
|
|
|
flag=1;
|
|
|
|
if (reclength != block_info.rec_len)
|
|
|
|
{
|
|
|
|
my_errno=HA_ERR_RECORD_CHANGED;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
} else if (reclength < block_info.data_len)
|
|
|
|
{
|
|
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
|
|
goto err;
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
reclength-= block_info.data_len;
|
|
|
|
cmp_length= block_info.data_len;
|
|
|
|
if (!reclength && info->s->calc_checksum)
|
|
|
|
cmp_length--; /* 'record' may not contain checksum */
|
|
|
|
|
2007-04-04 22:37:09 +02:00
|
|
|
if (_ma_cmp_buffer(info->dfile.file, record, block_info.filepos,
|
2007-01-18 20:38:14 +01:00
|
|
|
cmp_length))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
my_errno=HA_ERR_RECORD_CHANGED;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
flag=1;
|
|
|
|
record+=block_info.data_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
my_errno=0;
|
2007-01-18 20:38:14 +01:00
|
|
|
error= 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
err:
|
|
|
|
if (buffer != info->rec_buff)
|
|
|
|
my_afree((gptr) buffer);
|
2007-01-18 20:38:14 +01:00
|
|
|
DBUG_PRINT("exit", ("result: %d", error));
|
|
|
|
DBUG_RETURN(error);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Compare file to buffert */
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
static my_bool _ma_cmp_buffer(File file, const byte *buff, my_off_t filepos,
|
|
|
|
uint length)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint next_length;
|
|
|
|
char temp_buff[IO_SIZE*2];
|
|
|
|
DBUG_ENTER("_ma_cmp_buffer");
|
|
|
|
|
|
|
|
next_length= IO_SIZE*2 - (uint) (filepos & (IO_SIZE-1));
|
|
|
|
|
|
|
|
while (length > IO_SIZE*2)
|
|
|
|
{
|
|
|
|
if (my_pread(file,temp_buff,next_length,filepos, MYF(MY_NABP)) ||
|
|
|
|
memcmp((byte*) buff,temp_buff,next_length))
|
|
|
|
goto err;
|
|
|
|
filepos+=next_length;
|
|
|
|
buff+=next_length;
|
|
|
|
length-= next_length;
|
|
|
|
next_length=IO_SIZE*2;
|
|
|
|
}
|
|
|
|
if (my_pread(file,temp_buff,length,filepos,MYF(MY_NABP)))
|
|
|
|
goto err;
|
2007-01-18 20:38:14 +01:00
|
|
|
DBUG_RETURN(memcmp((byte*) buff,temp_buff,length) != 0);
|
2006-04-11 15:45:10 +02:00
|
|
|
err:
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-09-07 17:07:17 +02:00
|
|
|
/*
|
2007-04-19 12:18:56 +02:00
|
|
|
Read next record from datafile during table scan.
|
2006-09-07 17:07:17 +02:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_read_rnd_dynamic_record()
|
|
|
|
info MARIA_HA pointer to table.
|
|
|
|
buf Destination for record.
|
|
|
|
filepos From where to read the record.
|
|
|
|
skip_deleted_blocks If to repeat reading until a non-deleted
|
|
|
|
record is found.
|
|
|
|
|
|
|
|
NOTE
|
2007-04-19 12:18:56 +02:00
|
|
|
This is identical to _ma_read_dynamic_record(), except the following
|
|
|
|
cases:
|
2006-09-07 17:07:17 +02:00
|
|
|
|
2007-04-19 12:18:56 +02:00
|
|
|
- If there is no active row at 'filepos', continue scanning for
|
|
|
|
an active row. (This is becasue the previous
|
|
|
|
_ma_read_rnd_dynamic_record() call stored the next block position
|
|
|
|
in filepos, but this position may not be a start block for a row
|
|
|
|
- We may have READ_CACHING enabled, in which case we use the cache
|
|
|
|
to read rows.
|
2006-09-07 17:07:17 +02:00
|
|
|
|
2007-04-19 12:18:56 +02:00
|
|
|
For other comments, check _ma_read_dynamic_record()
|
2006-09-07 17:07:17 +02:00
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 OK
|
|
|
|
!= 0 Error
|
|
|
|
*/
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
int _ma_read_rnd_dynamic_record(MARIA_HA *info,
|
|
|
|
byte *buf,
|
2007-01-23 20:13:26 +01:00
|
|
|
MARIA_RECORD_POS filepos,
|
2006-04-11 15:45:10 +02:00
|
|
|
my_bool skip_deleted_blocks)
|
|
|
|
{
|
2006-09-07 17:07:17 +02:00
|
|
|
int block_of_record, info_read, save_errno;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint left_len,b_type;
|
|
|
|
byte *to;
|
|
|
|
MARIA_BLOCK_INFO block_info;
|
|
|
|
MARIA_SHARE *share=info->s;
|
|
|
|
DBUG_ENTER("_ma_read_rnd_dynamic_record");
|
|
|
|
|
|
|
|
info_read=0;
|
|
|
|
LINT_INIT(to);
|
|
|
|
|
|
|
|
if (info->lock_type == F_UNLCK)
|
|
|
|
{
|
|
|
|
#ifndef UNSAFE_LOCKING
|
|
|
|
#else
|
|
|
|
info->tmp_lock_type=F_RDLCK;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else
|
|
|
|
info_read=1; /* memory-keyinfoblock is ok */
|
|
|
|
|
2006-09-07 17:07:17 +02:00
|
|
|
block_of_record= 0; /* First block of record is numbered as zero. */
|
|
|
|
block_info.second_read= 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
left_len=1;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (filepos >= info->state->data_file_length)
|
|
|
|
{
|
|
|
|
if (!info_read)
|
|
|
|
{ /* Check if changed */
|
|
|
|
info_read=1;
|
|
|
|
info->rec_cache.seek_not_done=1;
|
2007-04-04 22:37:09 +02:00
|
|
|
if (_ma_state_info_read_dsk(share->kfile.file, &share->state, 1))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto panic;
|
|
|
|
}
|
|
|
|
if (filepos >= info->state->data_file_length)
|
|
|
|
{
|
|
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
|
|
{
|
|
|
|
if (_ma_read_cache(&info->rec_cache,(byte*) block_info.header,filepos,
|
|
|
|
sizeof(block_info.header),
|
2006-09-07 17:07:17 +02:00
|
|
|
(!block_of_record && skip_deleted_blocks ?
|
|
|
|
READING_NEXT : 0) | READING_HEADER))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto panic;
|
|
|
|
b_type= _ma_get_block_info(&block_info,-1,filepos);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
2006-09-07 17:07:17 +02:00
|
|
|
info->rec_cache.pos_in_file < filepos + MARIA_BLOCK_INFO_HEADER_LENGTH &&
|
2006-04-11 15:45:10 +02:00
|
|
|
flush_io_cache(&info->rec_cache))
|
|
|
|
DBUG_RETURN(my_errno);
|
|
|
|
info->rec_cache.seek_not_done=1;
|
2007-04-04 22:37:09 +02:00
|
|
|
b_type= _ma_get_block_info(&block_info, info->dfile.file, filepos);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (b_type & (BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR |
|
|
|
|
BLOCK_FATAL_ERROR))
|
|
|
|
{
|
|
|
|
if ((b_type & (BLOCK_DELETED | BLOCK_SYNC_ERROR))
|
|
|
|
&& skip_deleted_blocks)
|
|
|
|
{
|
|
|
|
filepos=block_info.filepos+block_info.block_len;
|
|
|
|
block_info.second_read=0;
|
|
|
|
continue; /* Search after next_record */
|
|
|
|
}
|
|
|
|
if (b_type & (BLOCK_DELETED | BLOCK_SYNC_ERROR))
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
my_errno= HA_ERR_RECORD_DELETED;
|
|
|
|
info->cur_row.lastpos= block_info.filepos;
|
|
|
|
info->cur_row.nextpos= block_info.filepos+block_info.block_len;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
goto err;
|
|
|
|
}
|
2006-09-07 17:07:17 +02:00
|
|
|
if (block_of_record == 0) /* First block */
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (block_info.rec_len > (uint) share->base.max_pack_length)
|
|
|
|
goto panic;
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.lastpos= filepos;
|
2006-04-11 15:45:10 +02:00
|
|
|
if (share->base.blobs)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if (_ma_alloc_buffer(&info->rec_buff, &info->rec_buff_size,
|
|
|
|
block_info.rec_len +
|
|
|
|
info->s->base.extra_rec_buff_size))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
to= info->rec_buff;
|
2006-04-11 15:45:10 +02:00
|
|
|
left_len=block_info.rec_len;
|
|
|
|
}
|
|
|
|
if (left_len < block_info.data_len)
|
|
|
|
goto panic; /* Wrong linked record */
|
|
|
|
|
|
|
|
/* copy information that is already read */
|
|
|
|
{
|
|
|
|
uint offset=(uint) (block_info.filepos - filepos);
|
|
|
|
uint tmp_length= (sizeof(block_info.header) - offset);
|
|
|
|
filepos=block_info.filepos;
|
|
|
|
|
|
|
|
if (tmp_length > block_info.data_len)
|
|
|
|
tmp_length= block_info.data_len;
|
|
|
|
if (tmp_length)
|
|
|
|
{
|
|
|
|
memcpy((byte*) to, block_info.header+offset,tmp_length);
|
|
|
|
block_info.data_len-=tmp_length;
|
|
|
|
left_len-=tmp_length;
|
|
|
|
to+=tmp_length;
|
|
|
|
filepos+=tmp_length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* read rest of record from file */
|
|
|
|
if (block_info.data_len)
|
|
|
|
{
|
|
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
|
|
{
|
|
|
|
if (_ma_read_cache(&info->rec_cache,(byte*) to,filepos,
|
|
|
|
block_info.data_len,
|
2006-09-07 17:07:17 +02:00
|
|
|
(!block_of_record && skip_deleted_blocks) ?
|
|
|
|
READING_NEXT : 0))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto panic;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-09-07 17:07:17 +02:00
|
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
|
|
|
info->rec_cache.pos_in_file <
|
|
|
|
block_info.filepos + block_info.data_len &&
|
|
|
|
flush_io_cache(&info->rec_cache))
|
|
|
|
goto err;
|
2007-04-04 22:37:09 +02:00
|
|
|
/* VOID(my_seek(info->dfile.file, filepos, MY_SEEK_SET, MYF(0))); */
|
|
|
|
if (my_read(info->dfile.file, (byte*)to, block_info.data_len,
|
|
|
|
MYF(MY_NABP)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (my_errno == -1)
|
|
|
|
my_errno= HA_ERR_WRONG_IN_RECORD; /* Unexpected end of file */
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-09-07 17:07:17 +02:00
|
|
|
/*
|
|
|
|
Increment block-of-record counter. If it was the first block,
|
|
|
|
remember the position behind the block for the next call.
|
|
|
|
*/
|
|
|
|
if (block_of_record++ == 0)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
info->cur_row.nextpos= block_info.filepos+block_info.block_len;
|
2006-04-11 15:45:10 +02:00
|
|
|
skip_deleted_blocks=0;
|
|
|
|
}
|
|
|
|
left_len-=block_info.data_len;
|
|
|
|
to+=block_info.data_len;
|
|
|
|
filepos=block_info.next_filepos;
|
|
|
|
} while (left_len);
|
|
|
|
|
|
|
|
info->update|= HA_STATE_AKTIV | HA_STATE_KEY_CHANGED;
|
|
|
|
fast_ma_writeinfo(info);
|
|
|
|
if (_ma_rec_unpack(info,buf,info->rec_buff,block_info.rec_len) !=
|
|
|
|
MY_FILE_ERROR)
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
DBUG_RETURN(my_errno); /* Wrong record */
|
|
|
|
|
|
|
|
panic:
|
|
|
|
my_errno=HA_ERR_WRONG_IN_RECORD; /* Something is fatal wrong */
|
|
|
|
err:
|
|
|
|
save_errno=my_errno;
|
|
|
|
VOID(_ma_writeinfo(info,0));
|
|
|
|
DBUG_RETURN(my_errno=save_errno);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Read and process header from a dynamic-record-file */
|
|
|
|
|
|
|
|
uint _ma_get_block_info(MARIA_BLOCK_INFO *info, File file, my_off_t filepos)
|
|
|
|
{
|
|
|
|
uint return_val=0;
|
|
|
|
uchar *header=info->header;
|
|
|
|
|
|
|
|
if (file >= 0)
|
|
|
|
{
|
2006-09-07 17:07:17 +02:00
|
|
|
/*
|
|
|
|
We do not use my_pread() here because we want to have the file
|
|
|
|
pointer set to the end of the header after this function.
|
|
|
|
my_pread() may leave the file pointer untouched.
|
|
|
|
*/
|
2006-04-11 15:45:10 +02:00
|
|
|
VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
|
|
|
|
if (my_read(file,(char*) header,sizeof(info->header),MYF(0)) !=
|
|
|
|
sizeof(info->header))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
DBUG_DUMP("header",(byte*) header,MARIA_BLOCK_INFO_HEADER_LENGTH);
|
|
|
|
if (info->second_read)
|
|
|
|
{
|
|
|
|
if (info->header[0] <= 6 || info->header[0] == 13)
|
|
|
|
return_val=BLOCK_SYNC_ERROR;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (info->header[0] > 6 && info->header[0] != 13)
|
|
|
|
return_val=BLOCK_SYNC_ERROR;
|
|
|
|
}
|
|
|
|
info->next_filepos= HA_OFFSET_ERROR; /* Dummy if no next block */
|
|
|
|
|
|
|
|
switch (info->header[0]) {
|
|
|
|
case 0:
|
|
|
|
if ((info->block_len=(uint) mi_uint3korr(header+1)) <
|
|
|
|
MARIA_MIN_BLOCK_LENGTH ||
|
|
|
|
(info->block_len & (MARIA_DYN_ALIGN_SIZE -1)))
|
|
|
|
goto err;
|
|
|
|
info->filepos=filepos;
|
|
|
|
info->next_filepos=mi_sizekorr(header+4);
|
|
|
|
info->prev_filepos=mi_sizekorr(header+12);
|
|
|
|
#if SIZEOF_OFF_T == 4
|
|
|
|
if ((mi_uint4korr(header+4) != 0 &&
|
|
|
|
(mi_uint4korr(header+4) != (ulong) ~0 ||
|
|
|
|
info->next_filepos != (ulong) ~0)) ||
|
|
|
|
(mi_uint4korr(header+12) != 0 &&
|
|
|
|
(mi_uint4korr(header+12) != (ulong) ~0 ||
|
|
|
|
info->prev_filepos != (ulong) ~0)))
|
|
|
|
goto err;
|
|
|
|
#endif
|
|
|
|
return return_val | BLOCK_DELETED; /* Deleted block */
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
info->rec_len=info->data_len=info->block_len=mi_uint2korr(header+1);
|
|
|
|
info->filepos=filepos+3;
|
|
|
|
return return_val | BLOCK_FIRST | BLOCK_LAST;
|
|
|
|
case 2:
|
|
|
|
info->rec_len=info->data_len=info->block_len=mi_uint3korr(header+1);
|
|
|
|
info->filepos=filepos+4;
|
|
|
|
return return_val | BLOCK_FIRST | BLOCK_LAST;
|
|
|
|
|
|
|
|
case 13:
|
|
|
|
info->rec_len=mi_uint4korr(header+1);
|
|
|
|
info->block_len=info->data_len=mi_uint3korr(header+5);
|
|
|
|
info->next_filepos=mi_sizekorr(header+8);
|
|
|
|
info->second_read=1;
|
|
|
|
info->filepos=filepos+16;
|
|
|
|
return return_val | BLOCK_FIRST;
|
|
|
|
|
|
|
|
case 3:
|
|
|
|
info->rec_len=info->data_len=mi_uint2korr(header+1);
|
|
|
|
info->block_len=info->rec_len+ (uint) header[3];
|
|
|
|
info->filepos=filepos+4;
|
|
|
|
return return_val | BLOCK_FIRST | BLOCK_LAST;
|
|
|
|
case 4:
|
|
|
|
info->rec_len=info->data_len=mi_uint3korr(header+1);
|
|
|
|
info->block_len=info->rec_len+ (uint) header[4];
|
|
|
|
info->filepos=filepos+5;
|
|
|
|
return return_val | BLOCK_FIRST | BLOCK_LAST;
|
|
|
|
|
|
|
|
case 5:
|
|
|
|
info->rec_len=mi_uint2korr(header+1);
|
|
|
|
info->block_len=info->data_len=mi_uint2korr(header+3);
|
|
|
|
info->next_filepos=mi_sizekorr(header+5);
|
|
|
|
info->second_read=1;
|
|
|
|
info->filepos=filepos+13;
|
|
|
|
return return_val | BLOCK_FIRST;
|
|
|
|
case 6:
|
|
|
|
info->rec_len=mi_uint3korr(header+1);
|
|
|
|
info->block_len=info->data_len=mi_uint3korr(header+4);
|
|
|
|
info->next_filepos=mi_sizekorr(header+7);
|
|
|
|
info->second_read=1;
|
|
|
|
info->filepos=filepos+15;
|
|
|
|
return return_val | BLOCK_FIRST;
|
|
|
|
|
|
|
|
/* The following blocks are identical to 1-6 without rec_len */
|
|
|
|
case 7:
|
|
|
|
info->data_len=info->block_len=mi_uint2korr(header+1);
|
|
|
|
info->filepos=filepos+3;
|
|
|
|
return return_val | BLOCK_LAST;
|
|
|
|
case 8:
|
|
|
|
info->data_len=info->block_len=mi_uint3korr(header+1);
|
|
|
|
info->filepos=filepos+4;
|
|
|
|
return return_val | BLOCK_LAST;
|
|
|
|
|
|
|
|
case 9:
|
|
|
|
info->data_len=mi_uint2korr(header+1);
|
|
|
|
info->block_len=info->data_len+ (uint) header[3];
|
|
|
|
info->filepos=filepos+4;
|
|
|
|
return return_val | BLOCK_LAST;
|
|
|
|
case 10:
|
|
|
|
info->data_len=mi_uint3korr(header+1);
|
|
|
|
info->block_len=info->data_len+ (uint) header[4];
|
|
|
|
info->filepos=filepos+5;
|
|
|
|
return return_val | BLOCK_LAST;
|
|
|
|
|
|
|
|
case 11:
|
|
|
|
info->data_len=info->block_len=mi_uint2korr(header+1);
|
|
|
|
info->next_filepos=mi_sizekorr(header+3);
|
|
|
|
info->second_read=1;
|
|
|
|
info->filepos=filepos+11;
|
|
|
|
return return_val;
|
|
|
|
case 12:
|
|
|
|
info->data_len=info->block_len=mi_uint3korr(header+1);
|
|
|
|
info->next_filepos=mi_sizekorr(header+4);
|
|
|
|
info->second_read=1;
|
|
|
|
info->filepos=filepos+12;
|
|
|
|
return return_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
err:
|
|
|
|
my_errno=HA_ERR_WRONG_IN_RECORD; /* Garbage */
|
|
|
|
return BLOCK_ERROR;
|
|
|
|
}
|