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 */
|
|
|
|
|
|
|
|
/*
|
|
|
|
Creates a index for a database by reading keys, sorting them and outputing
|
|
|
|
them in sorted order through MARIA_SORT_INFO functions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "ma_fulltext.h"
|
2006-12-19 19:15:53 +01:00
|
|
|
#if defined(MSDOS) || defined(__WIN__)
|
|
|
|
#include <fcntl.h>
|
|
|
|
#else
|
|
|
|
#include <stddef.h>
|
|
|
|
#endif
|
2006-04-11 15:45:10 +02:00
|
|
|
#include <queues.h>
|
|
|
|
|
|
|
|
/* static variables */
|
|
|
|
|
|
|
|
#undef MIN_SORT_MEMORY
|
|
|
|
#undef MYF_RW
|
|
|
|
#undef DISK_BUFFER_SIZE
|
|
|
|
|
|
|
|
#define MERGEBUFF 15
|
|
|
|
#define MERGEBUFF2 31
|
|
|
|
#define MIN_SORT_MEMORY (4096-MALLOC_OVERHEAD)
|
|
|
|
#define MYF_RW MYF(MY_NABP | MY_WME | MY_WAIT_IF_FULL)
|
|
|
|
#define DISK_BUFFER_SIZE (IO_SIZE*16)
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Pointers of functions for store and read keys from temp file
|
|
|
|
*/
|
|
|
|
|
|
|
|
extern void print_error _VARARGS((const char *fmt,...));
|
|
|
|
|
|
|
|
/* Functions defined in this file */
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static ha_rows find_all_keys(MARIA_SORT_PARAM *info,uint keys,
|
|
|
|
uchar **sort_keys,
|
|
|
|
DYNAMIC_ARRAY *buffpek,int *maxbuffer,
|
|
|
|
IO_CACHE *tempfile,
|
|
|
|
IO_CACHE *tempfile_for_exceptions);
|
|
|
|
static int write_keys(MARIA_SORT_PARAM *info, uchar **sort_keys,
|
|
|
|
uint count, BUFFPEK *buffpek,IO_CACHE *tempfile);
|
|
|
|
static int write_key(MARIA_SORT_PARAM *info, uchar *key,
|
|
|
|
IO_CACHE *tempfile);
|
|
|
|
static int write_index(MARIA_SORT_PARAM *info, uchar **sort_keys,
|
|
|
|
uint count);
|
|
|
|
static int merge_many_buff(MARIA_SORT_PARAM *info,uint keys,
|
|
|
|
uchar **sort_keys,
|
|
|
|
BUFFPEK *buffpek,int *maxbuffer,
|
|
|
|
IO_CACHE *t_file);
|
|
|
|
static uint read_to_buffer(IO_CACHE *fromfile,BUFFPEK *buffpek,
|
|
|
|
uint sort_length);
|
|
|
|
static int merge_buffers(MARIA_SORT_PARAM *info,uint keys,
|
|
|
|
IO_CACHE *from_file, IO_CACHE *to_file,
|
|
|
|
uchar **sort_keys, BUFFPEK *lastbuff,
|
|
|
|
BUFFPEK *Fb, BUFFPEK *Tb);
|
|
|
|
static int merge_index(MARIA_SORT_PARAM *,uint, uchar **,BUFFPEK *, int,
|
|
|
|
IO_CACHE *);
|
2006-04-11 15:45:10 +02:00
|
|
|
static int flush_maria_ft_buf(MARIA_SORT_PARAM *info);
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_keys_varlen(MARIA_SORT_PARAM *info, uchar **sort_keys,
|
|
|
|
uint count, BUFFPEK *buffpek,
|
|
|
|
IO_CACHE *tempfile);
|
|
|
|
static uint read_to_buffer_varlen(IO_CACHE *fromfile,BUFFPEK *buffpek,
|
|
|
|
uint sort_length);
|
|
|
|
static int write_merge_key(MARIA_SORT_PARAM *info, IO_CACHE *to_file,
|
|
|
|
uchar *key, uint sort_length, uint count);
|
|
|
|
static int write_merge_key_varlen(MARIA_SORT_PARAM *info,
|
|
|
|
IO_CACHE *to_file, uchar *key,
|
|
|
|
uint sort_length, uint count);
|
2006-04-11 15:45:10 +02:00
|
|
|
static inline int
|
2007-07-02 19:45:15 +02:00
|
|
|
my_var_write(MARIA_SORT_PARAM *info, IO_CACHE *to_file, uchar *bufs);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Creates a index of sorted keys
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_create_index_by_sort()
|
|
|
|
info Sort parameters
|
|
|
|
no_messages Set to 1 if no output
|
2007-10-09 20:09:50 +02:00
|
|
|
sortbuff_size Size of sortbuffer to allocate
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
RESULT
|
|
|
|
0 ok
|
|
|
|
<> 0 Error
|
|
|
|
*/
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
int _ma_create_index_by_sort(MARIA_SORT_PARAM *info, my_bool no_messages,
|
2007-10-09 20:09:50 +02:00
|
|
|
size_t sortbuff_size)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
int error,maxbuffer,skr;
|
2007-10-09 20:09:50 +02:00
|
|
|
size_t memavl,old_memavl;
|
|
|
|
uint keys,sort_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
DYNAMIC_ARRAY buffpek;
|
|
|
|
ha_rows records;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar **sort_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
IO_CACHE tempfile, tempfile_for_exceptions;
|
|
|
|
DBUG_ENTER("_ma_create_index_by_sort");
|
2007-11-28 20:38:30 +01:00
|
|
|
DBUG_PRINT("enter",("sort_buff_size: %lu sort_length: %d max_records: %lu",
|
|
|
|
(ulong) sortbuff_size, info->key_length,
|
|
|
|
(ulong) info->sort_info->max_records));
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if (info->keyinfo->flag & HA_VAR_LENGTH_KEY)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
info->write_keys= write_keys_varlen;
|
2006-04-11 15:45:10 +02:00
|
|
|
info->read_to_buffer=read_to_buffer_varlen;
|
|
|
|
info->write_key=write_merge_key_varlen;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
info->write_keys= write_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
info->read_to_buffer=read_to_buffer;
|
|
|
|
info->write_key=write_merge_key;
|
|
|
|
}
|
|
|
|
|
|
|
|
my_b_clear(&tempfile);
|
|
|
|
my_b_clear(&tempfile_for_exceptions);
|
|
|
|
bzero((char*) &buffpek,sizeof(buffpek));
|
2007-07-02 19:45:15 +02:00
|
|
|
sort_keys= (uchar **) NULL; error= 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
maxbuffer=1;
|
|
|
|
|
|
|
|
memavl=max(sortbuff_size,MIN_SORT_MEMORY);
|
|
|
|
records= info->sort_info->max_records;
|
|
|
|
sort_length= info->key_length;
|
|
|
|
LINT_INIT(keys);
|
|
|
|
|
|
|
|
while (memavl >= MIN_SORT_MEMORY)
|
|
|
|
{
|
First part of redo/undo for key pages
Added key_nr to st_maria_keydef for faster keyinfo->keynr conversion
For transactional tables, shift record number in keys up with 1 bit to have place to indicate if transid follows
Checksum for MyISAM now ignores NULL and not used part of VARCHAR
Renamed some variables that caused shadow compiler warnings
Moved extra() call when waiting for tables to not be used to after tables are removed from cache.
Fixed crashing bugs when using Maria TEMPORARY tables with TRUNCATE. Removed 'hack' code in sql directory to go around this bug.
pagecache_unlock_by_ulink() now has extra argument to say if page was changed.
Give error message if we fail to open control file
Mark page cache variables as not flushable
include/maria.h:
Made min page cache larger (needed for pinning key page)
Added key_nr to st_maria_keydef for faster keyinfo->keynr conversion
Added write_comp_flag to move some runtime code to maria_open()
include/my_base.h:
Added new error message to be used when handler initialization failed
include/my_global.h:
Renamed dummy to swap_dummy to avoid conflicts with local 'dummy' variables
include/my_handler.h:
Added const to some parameters
mysys/array.c:
More DBUG
mysys/my_error.c:
Fixed indentation
mysys/my_handler.c:
Added const to some parameters
Added missing error messages
sql/field.h:
Renamed variables to avoid variable shadowing
sql/handler.h:
Renamed parameter to avoid variable name conflict
sql/item.h:
Renamed variables to avoid variable shadowing
sql/log_event_old.h:
Renamed variables to avoid variable shadowing
sql/set_var.h:
Renamed variables to avoid variable shadowing
sql/sql_delete.cc:
Removed maria hack for temporary tables
Fixed indentation
sql/sql_table.cc:
Moved extra() call when waiting for tables to not be used to after tables are removed from cache.
This was needed to ensure we don't do a PREPARE_FOR_DROP or similar call while the table is still in use.
sql/table.cc:
Copy page_checksum from share
Removed Maria hack
storage/maria/Makefile.am:
Added new files
storage/maria/ha_maria.cc:
Renamed records -> record_count and info -> create_info to avoid variable name conflicts
Mark page cache variables as not flushable
storage/maria/ma_blockrec.c:
Moved _ma_unpin_all_pages() to ma_key_recover.c
Moved init of info->pinned_pages to ma_open.c
Moved _ma_finalize_row() to maria_key_recover.h
Renamed some variables to avoid variable name conflicts
Mark page_link.changed for blocks we change directly
Simplify handling of undo link when writing LOGREC_UNDO_ROW_INSERT (old code crashed when having redo for index)
storage/maria/ma_blockrec.h:
Removed extra empty line
storage/maria/ma_checkpoint.c:
Remove not needed trnman.h
storage/maria/ma_close.c:
Free pinned pages (which are now always allocated)
storage/maria/ma_control_file.c:
Give error message if we fail to open control file
storage/maria/ma_delete.c:
Changes for redo logging (first part, logging of underflow not yet done)
- Log undo-key-delete
- Log delete of key
- Updated arguments to _ma_fetch_keypage(), _ma_dispose(), _ma_write_keypage(), _ma_insert()
- Added new arguments to some functions to be able to write redo information
- Mark key pages as changed when we write with PAGECACHE_LOCK_LEFT_WRITELOCKED
Remove one not needed _ma_write_keypage() in d_search() when upper level will do the write anyway
Changed 2 bmove_upp() to bmove() as this made code easer to understand
More function comments
Indentation fixes
storage/maria/ma_ft_update.c:
New arguments to _ma_write_keypage()
storage/maria/ma_loghandler.c:
Fixed some DBUG_PRINT messages
Simplify code
Added new log entrys for key page redo
Renamed some variables to avoid variable name shadowing
storage/maria/ma_loghandler.h:
Moved some defines here
Added define for storing key number on key pages
Added new translog record types
Added enum for type of operations in LOGREC_REDO_INDEX
storage/maria/ma_open.c:
Always allocate info.pinned_pages (we need now also for normal key page usage)
Update keyinfo->key_nr
Added virtual functions to convert record position o number to be stored on key pages
Update keyinfo->write_comp_flag to value of search flag to be used when writing key
storage/maria/ma_page.c:
Added redo for key pages
- Extended _ma_fetch_keypage() with type of lock to put on page and address to used MARIA_PINNED_PAGE
- _ma_fetch_keypage() now pin's pages if needed
- Extended _ma_write_keypage() with type of locks to be used
- ma_dispose() now locks info->s->state.key_del from other threads
- ma_dispose() writes redo log record
- ma_new() locks info->s->state.key_del from other threads if it was used
- ma_new() now pins read page
Other things:
- Removed some not needed arguments from _ma_new() and _ma_dispose)
- Added some new variables to simplify code
- If EXTRA_DEBUG is used, do crc on full page to catch not unitialized bytes
storage/maria/ma_pagecache.h:
Applied patch from Sanja to add extra argument to pagecache_unlock_by_ulink() to mark if page was changed
Added some defines for pagecache priority levels that one can use
storage/maria/ma_range.c:
Added new arguments for call to _ma_fetch_keypage()
storage/maria/ma_recovery.c:
- Added hooks for new translog types:
REDO_INDEX, REDO_INDEX_NEW_PAGE, REDO_INDEX_FREE_PAGE, UNDO_KEY_INSERT, UNDO_KEY_DELETE and
UNDO_KEY_DELETE_WITH_ROOT.
- Moved variable declarations to start of function (portability fixes)
- Removed some not needed initializations
- Set only relevant state changes for each redo/undo entry
storage/maria/lockman.c:
Removed end space
storage/maria/ma_check.c:
Removed end space
storage/maria/ma_create.c:
Removed end space
storage/maria/ma_locking.c:
Removed end space
storage/maria/ma_packrec.c:
Removed end space
storage/maria/ma_pagecache.c:
Removed end space
storage/maria/ma_panic.c:
Removed end space
storage/maria/ma_rt_index.c:
Added new arguments for call to _ma_fetch_keypage(), _ma_write_keypage(), _ma_dispose() and _ma_new()
Fixed indentation
storage/maria/ma_rt_key.c:
Added new arguments for call to _ma_fetch_keypage()
storage/maria/ma_rt_split.c:
Added new arguments for call to _ma_new()
Use new keypage header
Added new arguments for call to _ma_write_keypage()
storage/maria/ma_search.c:
Updated comments & indentation
Added new arguments for call to _ma_fetch_keypage()
Made some variables and arguments const
Added virtual functions for converting row position to number to be stored in key
use MARIA_RECORD_POS of record position instead of my_off_t
Record in MARIA_KEY_PARAM how page was changed one key insert (needed for REDO)
storage/maria/ma_sort.c:
Removed end space
storage/maria/ma_statrec.c:
Updated arguments for call to _ma_rec_pos()
storage/maria/ma_test1.c:
Fixed too small buffer to init_pagecache()
Fixed bug when using insert_count and test_flag
storage/maria/ma_test2.c:
Use more resonable pagecache size
Remove not used code
Reset blob_length to fix wrong output message
storage/maria/ma_test_all.sh:
Fixed wrong test
storage/maria/ma_write.c:
Lots of new code to handle REDO of key pages
No logic changes because of REDO code, mostly adding new arguments and adding new code for logging
Added new arguments for calls to _ma_fetch_keypage(), _ma_write_keypage() and similar functions
Move setting of comp_flag in ma_ck_wrte_btree() from runtime to maria_open()
Zerofill new used pages for:
- To remove possible sensitive data left in buffer
- To get idenitical data on pages after running redo
- Better compression of pages if archived
storage/maria/maria_chk.c:
Added information if table is crash safe
storage/maria/maria_def.h:
New virtual function to convert between record position on key and normal record position
Aded mutex and extra variables to handle locking of share->state.key_del
Moved some structure variables to get things more aligned
Added extra arguments to MARIA_KEY_PARAM to be able to remember what was changed on key page on key insert
Added argument to MARIA_PINNED_PAGE to indicate if page was changed
Updated prototypes for functions
Added some structures for signaling changes in REDO handling
storage/maria/unittest/ma_pagecache_single.c:
Updated arguments for changed function calls
storage/myisam/mi_check.c:
Made calc_check_checksum virtual
storage/myisam/mi_checksum.c:
Update checksums to ignore null columns
storage/myisam/mi_create.c:
Mark if table has null column (to know when we have to use mi_checksum())
storage/myisam/mi_open.c:
Added virtual function for calculating checksum to be able to easily ignore NULL fields
storage/myisam/mi_test2.c:
Fixed bug
storage/myisam/myisamdef.h:
Added virtual function for calculating checksum during check table
Removed ha_key_cmp() as this is in handler.h
storage/maria/ma_key_recover.c:
New BitKeeper file ``storage/maria/ma_key_recover.c''
storage/maria/ma_key_recover.h:
New BitKeeper file ``storage/maria/ma_key_recover.h''
storage/maria/ma_key_redo.c:
New BitKeeper file ``storage/maria/ma_key_redo.c''
2007-11-14 18:08:06 +01:00
|
|
|
if ((records < UINT_MAX32) &&
|
|
|
|
((my_off_t) (records + 1) *
|
2007-07-27 12:06:39 +02:00
|
|
|
(sort_length + sizeof(char*)) <= (my_off_t) memavl))
|
2007-10-04 19:33:42 +02:00
|
|
|
keys= (uint)records+1;
|
2006-04-11 15:45:10 +02:00
|
|
|
else
|
|
|
|
do
|
|
|
|
{
|
|
|
|
skr=maxbuffer;
|
|
|
|
if (memavl < sizeof(BUFFPEK)*(uint) maxbuffer ||
|
|
|
|
(keys=(memavl-sizeof(BUFFPEK)*(uint) maxbuffer)/
|
2006-12-19 19:15:53 +01:00
|
|
|
(sort_length+sizeof(char*))) <= 1 ||
|
|
|
|
keys < (uint) maxbuffer)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
_ma_check_print_error(info->sort_info->param,
|
2007-07-27 12:06:39 +02:00
|
|
|
"maria_sort_buffer_size is too small");
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while ((maxbuffer= (int) (records/(keys-1)+1)) != skr);
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
if ((sort_keys=(uchar**) my_malloc(keys*(sort_length+sizeof(char*))+
|
2007-01-18 20:38:14 +01:00
|
|
|
HA_FT_MAXBYTELEN, MYF(0))))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (my_init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer,
|
|
|
|
maxbuffer/2))
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
my_free((uchar*) sort_keys,MYF(0));
|
2006-04-11 15:45:10 +02:00
|
|
|
sort_keys= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
old_memavl=memavl;
|
|
|
|
if ((memavl=memavl/4*3) < MIN_SORT_MEMORY && old_memavl > MIN_SORT_MEMORY)
|
|
|
|
memavl=MIN_SORT_MEMORY;
|
|
|
|
}
|
|
|
|
if (memavl < MIN_SORT_MEMORY)
|
|
|
|
{
|
2007-07-27 12:06:39 +02:00
|
|
|
_ma_check_print_error(info->sort_info->param, "Maria sort buffer"
|
|
|
|
" too small"); /* purecov: tested */
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err; /* purecov: tested */
|
|
|
|
}
|
|
|
|
(*info->lock_in_memory)(info->sort_info->param);/* Everything is allocated */
|
|
|
|
|
|
|
|
if (!no_messages)
|
|
|
|
printf(" - Searching for keys, allocating buffer for %d keys\n",keys);
|
|
|
|
|
|
|
|
if ((records=find_all_keys(info,keys,sort_keys,&buffpek,&maxbuffer,
|
|
|
|
&tempfile,&tempfile_for_exceptions))
|
|
|
|
== HA_POS_ERROR)
|
|
|
|
goto err; /* purecov: tested */
|
|
|
|
if (maxbuffer == 0)
|
|
|
|
{
|
|
|
|
if (!no_messages)
|
|
|
|
printf(" - Dumping %lu keys\n", (ulong) records);
|
|
|
|
if (write_index(info,sort_keys, (uint) records))
|
|
|
|
goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
keys=(keys*(sort_length+sizeof(char*)))/sort_length;
|
|
|
|
if (maxbuffer >= MERGEBUFF2)
|
|
|
|
{
|
|
|
|
if (!no_messages)
|
|
|
|
printf(" - Merging %lu keys\n", (ulong) records); /* purecov: tested */
|
|
|
|
if (merge_many_buff(info,keys,sort_keys,
|
|
|
|
dynamic_element(&buffpek,0,BUFFPEK *),&maxbuffer,&tempfile))
|
|
|
|
goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
if (flush_io_cache(&tempfile) ||
|
|
|
|
reinit_io_cache(&tempfile,READ_CACHE,0L,0,0))
|
|
|
|
goto err; /* purecov: inspected */
|
|
|
|
if (!no_messages)
|
|
|
|
printf(" - Last merge and dumping keys\n"); /* purecov: tested */
|
|
|
|
if (merge_index(info,keys,sort_keys,dynamic_element(&buffpek,0,BUFFPEK *),
|
|
|
|
maxbuffer,&tempfile))
|
|
|
|
goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flush_maria_ft_buf(info) || _ma_flush_pending_blocks(info))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (my_b_inited(&tempfile_for_exceptions))
|
|
|
|
{
|
2007-03-01 18:23:58 +01:00
|
|
|
MARIA_HA *idx=info->sort_info->info;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint keyno=info->key;
|
2007-03-01 18:23:58 +01:00
|
|
|
uint key_length, ref_length=idx->s->rec_reflength;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if (!no_messages)
|
|
|
|
printf(" - Adding exceptions\n"); /* purecov: tested */
|
|
|
|
if (flush_io_cache(&tempfile_for_exceptions) ||
|
|
|
|
reinit_io_cache(&tempfile_for_exceptions,READ_CACHE,0L,0,0))
|
|
|
|
goto err;
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
while (!my_b_read(&tempfile_for_exceptions,(uchar*)&key_length,
|
2006-04-11 15:45:10 +02:00
|
|
|
sizeof(key_length))
|
2007-07-02 19:45:15 +02:00
|
|
|
&& !my_b_read(&tempfile_for_exceptions,(uchar*)sort_keys,
|
2006-04-11 15:45:10 +02:00
|
|
|
(uint) key_length))
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
if (_ma_ck_write(idx,keyno,(uchar*) sort_keys,key_length-ref_length))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
error =0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (sort_keys)
|
2007-07-02 19:45:15 +02:00
|
|
|
my_free((uchar*) sort_keys,MYF(0));
|
2006-04-11 15:45:10 +02:00
|
|
|
delete_dynamic(&buffpek);
|
|
|
|
close_cached_file(&tempfile);
|
|
|
|
close_cached_file(&tempfile_for_exceptions);
|
|
|
|
|
|
|
|
DBUG_RETURN(error ? -1 : 0);
|
|
|
|
} /* _ma_create_index_by_sort */
|
|
|
|
|
|
|
|
|
|
|
|
/* Search after all keys and place them in a temp. file */
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static ha_rows find_all_keys(MARIA_SORT_PARAM *info, uint keys,
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar **sort_keys, DYNAMIC_ARRAY *buffpek,
|
2006-04-11 15:45:10 +02:00
|
|
|
int *maxbuffer, IO_CACHE *tempfile,
|
|
|
|
IO_CACHE *tempfile_for_exceptions)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
uint idx;
|
|
|
|
DBUG_ENTER("find_all_keys");
|
|
|
|
|
|
|
|
idx=error=0;
|
2007-07-02 19:45:15 +02:00
|
|
|
sort_keys[0]= (uchar*) (sort_keys+keys);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
while (!(error=(*info->key_read)(info,sort_keys[idx])))
|
|
|
|
{
|
|
|
|
if (info->real_key_length > info->key_length)
|
|
|
|
{
|
|
|
|
if (write_key(info,sort_keys[idx],tempfile_for_exceptions))
|
|
|
|
DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (++idx == keys)
|
|
|
|
{
|
2007-01-23 20:13:26 +01:00
|
|
|
if (info->write_keys(info,sort_keys,idx-1,
|
|
|
|
(BUFFPEK *)alloc_dynamic(buffpek),
|
|
|
|
tempfile))
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
sort_keys[0]=(uchar*) (sort_keys+keys);
|
2006-04-11 15:45:10 +02:00
|
|
|
memcpy(sort_keys[0],sort_keys[idx-1],(size_t) info->key_length);
|
|
|
|
idx=1;
|
|
|
|
}
|
|
|
|
sort_keys[idx]=sort_keys[idx-1]+info->key_length;
|
|
|
|
}
|
|
|
|
if (error > 0)
|
|
|
|
DBUG_RETURN(HA_POS_ERROR); /* Aborted by get_key */ /* purecov: inspected */
|
|
|
|
if (buffpek->elements)
|
|
|
|
{
|
|
|
|
if (info->write_keys(info,sort_keys,idx,(BUFFPEK *)alloc_dynamic(buffpek),
|
2007-01-23 20:13:26 +01:00
|
|
|
tempfile))
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
|
|
|
|
*maxbuffer=buffpek->elements-1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*maxbuffer=0;
|
|
|
|
|
|
|
|
DBUG_RETURN((*maxbuffer)*(keys-1)+idx);
|
|
|
|
} /* find_all_keys */
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef THREAD
|
|
|
|
/* Search after all keys and place them in a temp. file */
|
|
|
|
|
|
|
|
pthread_handler_t _ma_thr_find_all_keys(void *arg)
|
|
|
|
{
|
2006-12-19 19:15:53 +01:00
|
|
|
MARIA_SORT_PARAM *sort_param= (MARIA_SORT_PARAM*) arg;
|
2006-04-11 15:45:10 +02:00
|
|
|
int error;
|
2007-10-09 20:09:50 +02:00
|
|
|
size_t memavl,old_memavl;
|
|
|
|
uint sort_length;
|
|
|
|
ulong idx, maxbuffer, keys;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar **sort_keys=0;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
LINT_INIT(keys);
|
|
|
|
|
|
|
|
error=1;
|
|
|
|
|
|
|
|
if (my_thread_init())
|
|
|
|
goto err;
|
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
{ /* Add extra block since DBUG_ENTER declare variables */
|
|
|
|
DBUG_ENTER("_ma_thr_find_all_keys");
|
|
|
|
DBUG_PRINT("enter", ("master: %d", sort_param->master));
|
|
|
|
if (sort_param->sort_info->got_error)
|
|
|
|
goto err;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
if (sort_param->keyinfo->flag & HA_VAR_LENGTH_KEY)
|
|
|
|
{
|
|
|
|
sort_param->write_keys= write_keys_varlen;
|
|
|
|
sort_param->read_to_buffer= read_to_buffer_varlen;
|
|
|
|
sort_param->write_key= write_merge_key_varlen;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sort_param->write_keys= write_keys;
|
|
|
|
sort_param->read_to_buffer= read_to_buffer;
|
|
|
|
sort_param->write_key= write_merge_key;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
my_b_clear(&sort_param->tempfile);
|
|
|
|
my_b_clear(&sort_param->tempfile_for_exceptions);
|
|
|
|
bzero((char*) &sort_param->buffpek,sizeof(sort_param->buffpek));
|
|
|
|
bzero((char*) &sort_param->unique, sizeof(sort_param->unique));
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
memavl= max(sort_param->sortbuff_size, MIN_SORT_MEMORY);
|
2007-10-04 19:33:42 +02:00
|
|
|
idx= (uint)sort_param->sort_info->max_records;
|
2006-12-19 19:15:53 +01:00
|
|
|
sort_length= sort_param->key_length;
|
|
|
|
maxbuffer= 1;
|
|
|
|
|
|
|
|
while (memavl >= MIN_SORT_MEMORY)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-10-09 20:09:50 +02:00
|
|
|
if ((my_off_t) (idx+1)*(sort_length+sizeof(char*)) <= (my_off_t) memavl)
|
2006-12-19 19:15:53 +01:00
|
|
|
keys= idx+1;
|
|
|
|
else
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-10-09 20:09:50 +02:00
|
|
|
ulong skr;
|
2006-12-19 19:15:53 +01:00
|
|
|
do
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2006-12-19 19:15:53 +01:00
|
|
|
skr= maxbuffer;
|
|
|
|
if (memavl < sizeof(BUFFPEK)*maxbuffer ||
|
|
|
|
(keys=(memavl-sizeof(BUFFPEK)*maxbuffer)/
|
|
|
|
(sort_length+sizeof(char*))) <= 1 ||
|
2007-10-09 20:09:50 +02:00
|
|
|
keys < maxbuffer)
|
2006-12-19 19:15:53 +01:00
|
|
|
{
|
|
|
|
_ma_check_print_error(sort_param->sort_info->param,
|
2007-07-27 12:06:39 +02:00
|
|
|
"maria_sort_buffer_size is too small");
|
2006-12-19 19:15:53 +01:00
|
|
|
goto err;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2006-12-19 19:15:53 +01:00
|
|
|
while ((maxbuffer= (int) (idx/(keys-1)+1)) != skr);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-07-02 19:45:15 +02:00
|
|
|
if ((sort_keys= (uchar **)
|
2006-12-19 19:15:53 +01:00
|
|
|
my_malloc(keys*(sort_length+sizeof(char*))+
|
|
|
|
((sort_param->keyinfo->flag & HA_FULLTEXT) ?
|
|
|
|
HA_FT_MAXBYTELEN : 0), MYF(0))))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2006-12-19 19:15:53 +01:00
|
|
|
if (my_init_dynamic_array(&sort_param->buffpek, sizeof(BUFFPEK),
|
|
|
|
maxbuffer, maxbuffer/2))
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
my_free((uchar*) sort_keys,MYF(0));
|
|
|
|
sort_keys= (uchar **) NULL; /* for err: label */
|
2006-12-19 19:15:53 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2006-12-19 19:15:53 +01:00
|
|
|
old_memavl= memavl;
|
|
|
|
if ((memavl= memavl/4*3) < MIN_SORT_MEMORY &&
|
|
|
|
old_memavl > MIN_SORT_MEMORY)
|
|
|
|
memavl= MIN_SORT_MEMORY;
|
|
|
|
}
|
|
|
|
if (memavl < MIN_SORT_MEMORY)
|
|
|
|
{
|
|
|
|
_ma_check_print_error(sort_param->sort_info->param,
|
2007-07-27 12:06:39 +02:00
|
|
|
"Maria sort buffer too small");
|
2006-12-19 19:15:53 +01:00
|
|
|
goto err; /* purecov: tested */
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
if (sort_param->sort_info->param->testflag & T_VERBOSE)
|
2007-10-09 20:09:50 +02:00
|
|
|
printf("Key %d - Allocating buffer for %lu keys\n",
|
|
|
|
sort_param->key+1, (ulong) keys);
|
2006-12-19 19:15:53 +01:00
|
|
|
sort_param->sort_keys= sort_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
idx= error= 0;
|
2007-07-02 19:45:15 +02:00
|
|
|
sort_keys[0]= (uchar*) (sort_keys+keys);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
DBUG_PRINT("info", ("reading keys"));
|
|
|
|
while (!(error= sort_param->sort_info->got_error) &&
|
|
|
|
!(error= (*sort_param->key_read)(sort_param, sort_keys[idx])))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2006-12-19 19:15:53 +01:00
|
|
|
if (sort_param->real_key_length > sort_param->key_length)
|
|
|
|
{
|
|
|
|
if (write_key(sort_param,sort_keys[idx],
|
|
|
|
&sort_param->tempfile_for_exceptions))
|
|
|
|
goto err;
|
|
|
|
continue;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
if (++idx == keys)
|
|
|
|
{
|
|
|
|
if (sort_param->write_keys(sort_param, sort_keys, idx - 1,
|
2007-01-23 20:13:26 +01:00
|
|
|
(BUFFPEK *)alloc_dynamic(&sort_param->
|
|
|
|
buffpek),
|
2006-12-19 19:15:53 +01:00
|
|
|
&sort_param->tempfile))
|
|
|
|
goto err;
|
2007-07-02 19:45:15 +02:00
|
|
|
sort_keys[0]= (uchar*) (sort_keys+keys);
|
2007-01-23 20:13:26 +01:00
|
|
|
memcpy(sort_keys[0], sort_keys[idx - 1],
|
|
|
|
(size_t) sort_param->key_length);
|
2006-12-19 19:15:53 +01:00
|
|
|
idx= 1;
|
|
|
|
}
|
|
|
|
sort_keys[idx]=sort_keys[idx - 1] + sort_param->key_length;
|
|
|
|
}
|
|
|
|
if (error > 0)
|
|
|
|
goto err;
|
|
|
|
if (sort_param->buffpek.elements)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2006-12-19 19:15:53 +01:00
|
|
|
if (sort_param->write_keys(sort_param,sort_keys, idx,
|
2007-01-23 20:13:26 +01:00
|
|
|
(BUFFPEK *) alloc_dynamic(&sort_param->
|
|
|
|
buffpek),
|
|
|
|
&sort_param->tempfile))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
2006-12-19 19:15:53 +01:00
|
|
|
sort_param->keys= (sort_param->buffpek.elements - 1) * (keys - 1) + idx;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2006-12-19 19:15:53 +01:00
|
|
|
else
|
|
|
|
sort_param->keys= idx;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
sort_param->sort_keys_length= keys;
|
|
|
|
goto ok;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
err:
|
2006-12-19 19:15:53 +01:00
|
|
|
DBUG_PRINT("error", ("got some error"));
|
|
|
|
sort_param->sort_info->got_error= 1; /* no need to protect with a mutex */
|
2007-07-02 19:45:15 +02:00
|
|
|
my_free((uchar*) sort_keys,MYF(MY_ALLOW_ZERO_PTR));
|
2006-12-19 19:15:53 +01:00
|
|
|
sort_param->sort_keys=0;
|
|
|
|
delete_dynamic(& sort_param->buffpek);
|
|
|
|
close_cached_file(&sort_param->tempfile);
|
|
|
|
close_cached_file(&sort_param->tempfile_for_exceptions);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
ok:
|
2006-12-19 19:15:53 +01:00
|
|
|
free_root(&sort_param->wordroot, MYF(0));
|
|
|
|
/*
|
|
|
|
Detach from the share if the writer is involved. Avoid others to
|
|
|
|
be blocked. This includes a flush of the write buffer. This will
|
|
|
|
also indicate EOF to the readers.
|
|
|
|
*/
|
|
|
|
if (sort_param->sort_info->info->rec_cache.share)
|
|
|
|
remove_io_thread(&sort_param->sort_info->info->rec_cache);
|
|
|
|
|
|
|
|
/* Readers detach from the share if any. Avoid others to be blocked. */
|
|
|
|
if (sort_param->read_cache.share)
|
|
|
|
remove_io_thread(&sort_param->read_cache);
|
|
|
|
|
|
|
|
pthread_mutex_lock(&sort_param->sort_info->mutex);
|
|
|
|
if (!--sort_param->sort_info->threads_running)
|
|
|
|
pthread_cond_signal(&sort_param->sort_info->cond);
|
|
|
|
pthread_mutex_unlock(&sort_param->sort_info->mutex);
|
|
|
|
DBUG_PRINT("exit", ("======== ending thread ========"));
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
my_thread_end();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int _ma_thr_write_keys(MARIA_SORT_PARAM *sort_param)
|
|
|
|
{
|
|
|
|
MARIA_SORT_INFO *sort_info=sort_param->sort_info;
|
|
|
|
HA_CHECK *param=sort_info->param;
|
|
|
|
ulong length, keys;
|
2007-10-09 20:09:50 +02:00
|
|
|
double *rec_per_key_part= param->new_rec_per_key_part;
|
2006-04-11 15:45:10 +02:00
|
|
|
int got_error=sort_info->got_error;
|
|
|
|
uint i;
|
|
|
|
MARIA_HA *info=sort_info->info;
|
2007-12-10 01:32:00 +01:00
|
|
|
MARIA_SHARE *share= info->s;
|
2006-04-11 15:45:10 +02:00
|
|
|
MARIA_SORT_PARAM *sinfo;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *mergebuf=0;
|
2006-12-19 19:15:53 +01:00
|
|
|
DBUG_ENTER("_ma_thr_write_keys");
|
2006-04-11 15:45:10 +02:00
|
|
|
LINT_INIT(length);
|
|
|
|
|
|
|
|
for (i= 0, sinfo= sort_param ;
|
|
|
|
i < sort_info->total_keys ;
|
|
|
|
i++, rec_per_key_part+=sinfo->keyinfo->keysegs, sinfo++)
|
|
|
|
{
|
|
|
|
if (!sinfo->sort_keys)
|
|
|
|
{
|
|
|
|
got_error=1;
|
2007-01-23 20:13:26 +01:00
|
|
|
my_free(sinfo->rec_buff, MYF(MY_ALLOW_ZERO_PTR));
|
2006-04-11 15:45:10 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!got_error)
|
|
|
|
{
|
|
|
|
maria_set_key_active(share->state.key_map, sinfo->key);
|
|
|
|
|
|
|
|
if (!sinfo->buffpek.elements)
|
|
|
|
{
|
|
|
|
if (param->testflag & T_VERBOSE)
|
|
|
|
{
|
|
|
|
printf("Key %d - Dumping %u keys\n",sinfo->key+1, sinfo->keys);
|
|
|
|
fflush(stdout);
|
|
|
|
}
|
|
|
|
if (write_index(sinfo, sinfo->sort_keys, sinfo->keys) ||
|
|
|
|
flush_maria_ft_buf(sinfo) || _ma_flush_pending_blocks(sinfo))
|
|
|
|
got_error=1;
|
|
|
|
}
|
2006-09-07 17:07:17 +02:00
|
|
|
if (!got_error && param->testflag & T_STATISTICS)
|
|
|
|
maria_update_key_parts(sinfo->keyinfo, rec_per_key_part, sinfo->unique,
|
WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"
Added argument to maria_end_bulk_insert() to know if the table will be deleted after the operation
Fixed wrong call to strmake
Don't call bulk insert in case of inserting only one row (speed optimization as starting/stopping bulk insert
Allow storing year 2155 in year field
When running with purify/valgrind avoid copying structures over themself
Added hook 'trnnam_end_trans_hook' that is called when transaction ends
Added trn->used_tables that is used to an entry for all tables used by transaction
Fixed that ndb doesn't crash on duplicate key error when start_bulk_insert/end_bulk_insert are not called
include/maria.h:
Added argument to maria_end_bulk_insert() to know if the table will be deleted after the operation
include/my_tree.h:
Added macro 'reset_free_element()' to be able to ignore calls to the external free function.
Is used to optimize end-bulk-insert in case of failures, in which case we don't want write the remaining keys in the tree
mysql-test/install_test_db.sh:
Upgrade to new mysql_install_db options
mysql-test/r/maria-mvcc.result:
New tests
mysql-test/r/maria.result:
New tests
mysql-test/suite/ndb/r/ndb_auto_increment.result:
Fixed error message now when bulk insert is not always called
mysql-test/suite/ndb/t/ndb_auto_increment.test:
Fixed error message now when bulk insert is not always called
mysql-test/t/maria-mvcc.test:
Added testing of versioning of count(*)
mysql-test/t/maria-page-checksum.test:
Added comment
mysql-test/t/maria.test:
More tests
mysys/hash.c:
Code style change
sql/field.cc:
Allow storing year 2155 in year field
sql/ha_ndbcluster.cc:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
sql/ha_ndbcluster.h:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
sql/ha_partition.cc:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
sql/ha_partition.h:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
sql/handler.cc:
Don't call get_dup_key() if there is no table object. This can happen if the handler generates a duplicate key error on commit
sql/handler.h:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored (ie, the table will be deleted)
sql/item.cc:
Style fix
Removed compiler warning
sql/log_event.cc:
Added new argument to ha_end_bulk_insert()
sql/log_event_old.cc:
Added new argument to ha_end_bulk_insert()
sql/mysqld.cc:
Removed compiler warning
sql/protocol.cc:
Added DBUG
sql/sql_class.cc:
Added DBUG
Fixed wrong call to strmake
sql/sql_insert.cc:
Don't call bulk insert in case of inserting only one row (speed optimization as starting/stopping bulk insert involves a lot of if's)
Added new argument to ha_end_bulk_insert()
sql/sql_load.cc:
Added new argument to ha_end_bulk_insert()
sql/sql_parse.cc:
Style fixes
Avoid goto in common senario
sql/sql_select.cc:
When running with purify/valgrind avoid copying structures over themself. This is not a real bug in itself, but it's a waste of cycles and causes valgrind warnings
sql/sql_select.h:
Avoid copying structures over themself. This is not a real bug in itself, but it's a waste of cycles and causes valgrind warnings
sql/sql_table.cc:
Call HA_EXTRA_PREPARE_FOR_DROP if table created by ALTER TABLE is going to be dropped
Added new argument to ha_end_bulk_insert()
storage/archive/ha_archive.cc:
Added new argument to end_bulk_insert()
storage/archive/ha_archive.h:
Added new argument to end_bulk_insert()
storage/federated/ha_federated.cc:
Added new argument to end_bulk_insert()
storage/federated/ha_federated.h:
Added new argument to end_bulk_insert()
storage/maria/Makefile.am:
Added ma_state.c and ma_state.h
storage/maria/ha_maria.cc:
Versioning of count(*) and checksum
- share->state.state is now assumed to be correct, not handler->state
- Call _ma_setup_live_state() in external lock to get count(*)/checksum versioning. In case of
not versioned and not concurrent insertable table, file->s->state.state contains the correct state information
Other things:
- file->s -> share
- Added DBUG_ASSERT() for unlikely case
- Optimized end_bulk_insert() to not write anything if table is going to be deleted (as in failed alter table)
- Indentation changes in external_lock becasue of removed 'goto' caused a big conflict even if very little was changed
storage/maria/ha_maria.h:
New argument to end_bulk_insert()
storage/maria/ma_blockrec.c:
Update for versioning of count(*) and checksum
Keep share->state.state.data_file_length up to date (not info->state->data_file_length)
Moved _ma_block_xxxx_status() and maria_versioning() functions to ma_state.c
storage/maria/ma_check.c:
Update and use share->state.state instead of info->state
info->s to share
Update info->state at end of repair
Call _ma_reset_state() to update share->state_history at end of repair
storage/maria/ma_checkpoint.c:
Call _ma_remove_not_visible_states() on checkpoint to clean up not visible state history from tables
storage/maria/ma_close.c:
Remember state history for running transaction even if table is closed
storage/maria/ma_commit.c:
Ensure we always call trnman_commit_trn() even if other calls fails. If we don't do that, the translog and state structures will not be freed
storage/maria/ma_delete.c:
Versioning of count(*) and checksum:
- Always update info->state->checksum and info->state->records
storage/maria/ma_delete_all.c:
Versioning of count(*) and checksum:
- Ensure that share->state.state is updated, as here is where we store the primary information
storage/maria/ma_dynrec.c:
Use lock_key_trees instead of concurrent_insert to check if trees should be locked.
This allows us to lock trees both for concurrent_insert and for index versioning.
storage/maria/ma_extra.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
- share->concurrent_insert -> share->non_transactional_concurrent_insert
- Don't update share->state.state from info->state if transactional table
Optimization:
- Don't flush io_cache or bitmap if we are using FLUSH_IGNORE_CHANGED
storage/maria/ma_info.c:
Get most state information from current state
storage/maria/ma_init.c:
Add hash table and free function to store states for closed tables
Install hook for transaction commit/rollback to update history state
storage/maria/ma_key_recover.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
storage/maria/ma_locking.c:
Versioning of count(*) and checksum:
- Call virtual functions (if exists) to restore/update status
- Move _ma_xxx_status() functions to ma_state.c
info->s -> share
storage/maria/ma_open.c:
Versioning of count(*) and checksum:
- For not transactional tables, set info->state to point to new allocated state structure.
- Initialize new info->state_start variable that points to state at start of transaction
- Copy old history states from hash table (maria_stored_states) first time the table is opened
- Split flag share->concurrent_insert to non_transactional_concurrent_insert & lock_key_tree
- For now, only enable versioning of tables without keys (to be fixed in soon!)
- Added new virtual function to restore status in maria_lock_database)
More DBUG
storage/maria/ma_page.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
- Modify share->state.state.key_file_length under share->intern_lock
storage/maria/ma_range.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
info->s -> share
storage/maria/ma_recovery.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
- Update state information on close and when reenabling logging
storage/maria/ma_rkey.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
storage/maria/ma_rnext.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
storage/maria/ma_rnext_same.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
- Only skip rows based on file length if non_transactional_concurrent_insert is set
storage/maria/ma_rprev.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
storage/maria/ma_rsame.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
storage/maria/ma_sort.c:
Use share->state.state instead of info->state
Fixed indentation
storage/maria/ma_static.c:
Added maria_stored_state
storage/maria/ma_update.c:
Versioning of count(*) and checksum:
- Always update info->state->checksum and info->state->records
- Remove optimization for index file update as it doesn't work for transactional tables
storage/maria/ma_write.c:
Versioning of count(*) and checksum:
- Always update info->state->checksum and info->state->records
storage/maria/maria_def.h:
Move MARIA_STATUS_INFO to ma_state.h
Changes to MARIA_SHARE:
- Added state_history to store count(*)/checksum states
- Added in_trans as counter if table is used by running transactions
- Split concurrent_insert into lock_key_trees and on_transactional_concurrent_insert.
- Added virtual function lock_restore_status
Changes to MARIA_HA:
- save_state -> state_save
- Added state_start to store state at start of transaction
storage/maria/maria_pack.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
Indentation fixes
storage/maria/trnman.c:
Added hook 'trnnam_end_trans_hook' that is called when transaction ends
Added trn->used_tables that is used to an entry for all tables used by transaction
More DBUG
Changed return type of trnman_end_trn() to my_bool
Added trnman_get_min_trid() to get minimum trid in use.
Added trnman_exists_active_transactions() to check if there exist a running transaction started between two commit id
storage/maria/trnman.h:
Added 'used_tables'
Moved all pointers into same groups to get better memory alignment
storage/maria/trnman_public.h:
Added prototypes for new functions and variables
Chagned return type of trnman_end_trn() to my_bool
storage/myisam/ha_myisam.cc:
Added argument to end_bulk_insert() if operation should be aborted
storage/myisam/ha_myisam.h:
Added argument to end_bulk_insert() if operation should be aborted
storage/maria/ma_state.c:
Functions to handle state of count(*) and checksum
storage/maria/ma_state.h:
Structures and declarations to handle state of count(*) and checksum
2008-05-29 17:33:33 +02:00
|
|
|
param->stats_method ==
|
|
|
|
MI_STATS_METHOD_IGNORE_NULLS ?
|
|
|
|
sinfo->notnull : NULL,
|
|
|
|
(ulonglong) share->state.state.records);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2007-07-02 19:45:15 +02:00
|
|
|
my_free((uchar*) sinfo->sort_keys,MYF(0));
|
2007-01-26 12:32:02 +01:00
|
|
|
my_free(sinfo->rec_buff, MYF(MY_ALLOW_ZERO_PTR));
|
2006-04-11 15:45:10 +02:00
|
|
|
sinfo->sort_keys=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i= 0, sinfo= sort_param ;
|
|
|
|
i < sort_info->total_keys ;
|
|
|
|
i++,
|
|
|
|
delete_dynamic(&sinfo->buffpek),
|
|
|
|
close_cached_file(&sinfo->tempfile),
|
|
|
|
close_cached_file(&sinfo->tempfile_for_exceptions),
|
|
|
|
sinfo++)
|
|
|
|
{
|
|
|
|
if (got_error)
|
|
|
|
continue;
|
2006-12-19 19:15:53 +01:00
|
|
|
if (sinfo->keyinfo->flag & HA_VAR_LENGTH_KEY)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
sinfo->write_keys=write_keys_varlen;
|
|
|
|
sinfo->read_to_buffer=read_to_buffer_varlen;
|
|
|
|
sinfo->write_key=write_merge_key_varlen;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sinfo->write_keys=write_keys;
|
|
|
|
sinfo->read_to_buffer=read_to_buffer;
|
|
|
|
sinfo->write_key=write_merge_key;
|
|
|
|
}
|
|
|
|
if (sinfo->buffpek.elements)
|
|
|
|
{
|
|
|
|
uint maxbuffer=sinfo->buffpek.elements-1;
|
|
|
|
if (!mergebuf)
|
|
|
|
{
|
|
|
|
length=param->sort_buffer_length;
|
2008-04-01 16:57:30 +02:00
|
|
|
while (length >= MIN_SORT_MEMORY)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2008-04-01 16:57:30 +02:00
|
|
|
if ((mergebuf= my_malloc(length, MYF(0))))
|
|
|
|
break;
|
2006-04-11 15:45:10 +02:00
|
|
|
length=length*3/4;
|
|
|
|
}
|
|
|
|
if (!mergebuf)
|
|
|
|
{
|
|
|
|
got_error=1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
keys=length/sinfo->key_length;
|
|
|
|
if (maxbuffer >= MERGEBUFF2)
|
|
|
|
{
|
|
|
|
if (param->testflag & T_VERBOSE)
|
|
|
|
printf("Key %d - Merging %u keys\n",sinfo->key+1, sinfo->keys);
|
2007-07-02 19:45:15 +02:00
|
|
|
if (merge_many_buff(sinfo, keys, (uchar **) mergebuf,
|
2006-04-11 15:45:10 +02:00
|
|
|
dynamic_element(&sinfo->buffpek, 0, BUFFPEK *),
|
|
|
|
(int*) &maxbuffer, &sinfo->tempfile))
|
|
|
|
{
|
|
|
|
got_error=1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (flush_io_cache(&sinfo->tempfile) ||
|
|
|
|
reinit_io_cache(&sinfo->tempfile,READ_CACHE,0L,0,0))
|
|
|
|
{
|
|
|
|
got_error=1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (param->testflag & T_VERBOSE)
|
|
|
|
printf("Key %d - Last merge and dumping keys\n", sinfo->key+1);
|
2007-07-02 19:45:15 +02:00
|
|
|
if (merge_index(sinfo, keys, (uchar**) mergebuf,
|
2006-04-11 15:45:10 +02:00
|
|
|
dynamic_element(&sinfo->buffpek,0,BUFFPEK *),
|
|
|
|
maxbuffer,&sinfo->tempfile) ||
|
|
|
|
flush_maria_ft_buf(sinfo) ||
|
|
|
|
_ma_flush_pending_blocks(sinfo))
|
|
|
|
{
|
|
|
|
got_error=1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (my_b_inited(&sinfo->tempfile_for_exceptions))
|
|
|
|
{
|
|
|
|
uint key_length;
|
|
|
|
|
|
|
|
if (param->testflag & T_VERBOSE)
|
|
|
|
printf("Key %d - Dumping 'long' keys\n", sinfo->key+1);
|
|
|
|
|
|
|
|
if (flush_io_cache(&sinfo->tempfile_for_exceptions) ||
|
|
|
|
reinit_io_cache(&sinfo->tempfile_for_exceptions,READ_CACHE,0L,0,0))
|
|
|
|
{
|
|
|
|
got_error=1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (!got_error &&
|
2007-07-02 19:45:15 +02:00
|
|
|
!my_b_read(&sinfo->tempfile_for_exceptions,(uchar*)&key_length,
|
2006-04-11 15:45:10 +02:00
|
|
|
sizeof(key_length)))
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar maria_ft_buf[HA_FT_MAXBYTELEN + HA_FT_WLEN + 10];
|
2006-04-11 15:45:10 +02:00
|
|
|
if (key_length > sizeof(maria_ft_buf) ||
|
2007-07-02 19:45:15 +02:00
|
|
|
my_b_read(&sinfo->tempfile_for_exceptions, (uchar*)maria_ft_buf,
|
2006-04-11 15:45:10 +02:00
|
|
|
(uint)key_length) ||
|
2007-01-18 20:38:14 +01:00
|
|
|
_ma_ck_write(info, sinfo->key, maria_ft_buf,
|
2006-04-11 15:45:10 +02:00
|
|
|
key_length - info->s->rec_reflength))
|
|
|
|
got_error=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-07-02 19:45:15 +02:00
|
|
|
my_free((uchar*) mergebuf,MYF(MY_ALLOW_ZERO_PTR));
|
2006-12-19 19:15:53 +01:00
|
|
|
DBUG_RETURN(got_error);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
#endif /* THREAD */
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
/* Write all keys in memory to file for later merge */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
static int write_keys(MARIA_SORT_PARAM *info, register uchar **sort_keys,
|
2007-01-23 20:13:26 +01:00
|
|
|
uint count, BUFFPEK *buffpek, IO_CACHE *tempfile)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar **end;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint sort_length=info->key_length;
|
|
|
|
DBUG_ENTER("write_keys");
|
|
|
|
|
2007-12-16 19:37:22 +01:00
|
|
|
my_qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp,
|
|
|
|
info);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (!my_b_inited(tempfile) &&
|
|
|
|
open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
|
|
|
|
DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
|
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
|
|
|
|
|
|
buffpek->file_pos=my_b_tell(tempfile);
|
|
|
|
buffpek->count=count;
|
|
|
|
|
|
|
|
for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if (my_b_write(tempfile, *sort_keys, (uint) sort_length))
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
} /* write_keys */
|
|
|
|
|
|
|
|
|
|
|
|
static inline int
|
2007-07-02 19:45:15 +02:00
|
|
|
my_var_write(MARIA_SORT_PARAM *info, IO_CACHE *to_file, uchar *bufs)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
int err;
|
2007-01-18 20:38:14 +01:00
|
|
|
uint16 len= _ma_keylength(info->keyinfo, bufs);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
/* The following is safe as this is a local file */
|
2007-07-02 19:45:15 +02:00
|
|
|
if ((err= my_b_write(to_file, (uchar*)&len, sizeof(len))))
|
2006-04-11 15:45:10 +02:00
|
|
|
return (err);
|
|
|
|
if ((err= my_b_write(to_file,bufs, (uint) len)))
|
|
|
|
return (err);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_keys_varlen(MARIA_SORT_PARAM *info,
|
2007-07-02 19:45:15 +02:00
|
|
|
register uchar **sort_keys,
|
2006-04-11 15:45:10 +02:00
|
|
|
uint count, BUFFPEK *buffpek,
|
|
|
|
IO_CACHE *tempfile)
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar **end;
|
2006-04-11 15:45:10 +02:00
|
|
|
int err;
|
|
|
|
DBUG_ENTER("write_keys_varlen");
|
|
|
|
|
2007-12-16 19:37:22 +01:00
|
|
|
my_qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp,
|
|
|
|
info);
|
2006-04-11 15:45:10 +02:00
|
|
|
if (!my_b_inited(tempfile) &&
|
|
|
|
open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
|
|
|
|
DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
|
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
|
|
|
|
|
|
buffpek->file_pos=my_b_tell(tempfile);
|
|
|
|
buffpek->count=count;
|
|
|
|
for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if ((err= my_var_write(info,tempfile, *sort_keys)))
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(err);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
} /* write_keys_varlen */
|
|
|
|
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_key(MARIA_SORT_PARAM *info, uchar *key,
|
2006-04-11 15:45:10 +02:00
|
|
|
IO_CACHE *tempfile)
|
|
|
|
{
|
|
|
|
uint key_length=info->real_key_length;
|
|
|
|
DBUG_ENTER("write_key");
|
|
|
|
|
|
|
|
if (!my_b_inited(tempfile) &&
|
|
|
|
open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
|
|
|
|
DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
2007-07-02 19:45:15 +02:00
|
|
|
if (my_b_write(tempfile, (uchar*)&key_length,sizeof(key_length)) ||
|
2007-01-18 20:38:14 +01:00
|
|
|
my_b_write(tempfile, key, (uint) key_length))
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
} /* write_key */
|
|
|
|
|
|
|
|
|
|
|
|
/* Write index */
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_index(MARIA_SORT_PARAM *info,
|
2007-07-02 19:45:15 +02:00
|
|
|
register uchar **sort_keys,
|
2006-04-11 15:45:10 +02:00
|
|
|
register uint count)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("write_index");
|
|
|
|
|
2007-12-16 19:37:22 +01:00
|
|
|
my_qsort2((uchar*) sort_keys,(size_t) count,sizeof(uchar*),
|
|
|
|
(qsort2_cmp) info->key_cmp,info);
|
2006-04-11 15:45:10 +02:00
|
|
|
while (count--)
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
if ((*info->key_write)(info, *sort_keys++))
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(-1); /* purecov: inspected */
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
} /* write_index */
|
|
|
|
|
|
|
|
|
|
|
|
/* Merge buffers to make < MERGEBUFF2 buffers */
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static int merge_many_buff(MARIA_SORT_PARAM *info, uint keys,
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar **sort_keys, BUFFPEK *buffpek,
|
2006-04-11 15:45:10 +02:00
|
|
|
int *maxbuffer, IO_CACHE *t_file)
|
|
|
|
{
|
|
|
|
register int i;
|
|
|
|
IO_CACHE t_file2, *from_file, *to_file, *temp;
|
|
|
|
BUFFPEK *lastbuff;
|
|
|
|
DBUG_ENTER("merge_many_buff");
|
|
|
|
|
|
|
|
if (*maxbuffer < MERGEBUFF2)
|
|
|
|
DBUG_RETURN(0); /* purecov: inspected */
|
|
|
|
if (flush_io_cache(t_file) ||
|
|
|
|
open_cached_file(&t_file2,my_tmpdir(info->tmpdir),"ST",
|
|
|
|
DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
|
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
|
|
|
|
|
|
from_file= t_file ; to_file= &t_file2;
|
|
|
|
while (*maxbuffer >= MERGEBUFF2)
|
|
|
|
{
|
|
|
|
reinit_io_cache(from_file,READ_CACHE,0L,0,0);
|
|
|
|
reinit_io_cache(to_file,WRITE_CACHE,0L,0,0);
|
|
|
|
lastbuff=buffpek;
|
|
|
|
for (i=0 ; i <= *maxbuffer-MERGEBUFF*3/2 ; i+=MERGEBUFF)
|
|
|
|
{
|
|
|
|
if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++,
|
|
|
|
buffpek+i,buffpek+i+MERGEBUFF-1))
|
2007-07-27 12:06:39 +02:00
|
|
|
goto cleanup;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++,
|
|
|
|
buffpek+i,buffpek+ *maxbuffer))
|
|
|
|
break; /* purecov: inspected */
|
|
|
|
if (flush_io_cache(to_file))
|
|
|
|
break; /* purecov: inspected */
|
|
|
|
temp=from_file; from_file=to_file; to_file=temp;
|
|
|
|
*maxbuffer= (int) (lastbuff-buffpek)-1;
|
|
|
|
}
|
2007-07-27 12:06:39 +02:00
|
|
|
cleanup:
|
2006-04-11 15:45:10 +02:00
|
|
|
close_cached_file(to_file); /* This holds old result */
|
|
|
|
if (to_file == t_file)
|
|
|
|
*t_file=t_file2; /* Copy result file */
|
|
|
|
|
|
|
|
DBUG_RETURN(*maxbuffer >= MERGEBUFF2); /* Return 1 if interrupted */
|
|
|
|
} /* merge_many_buff */
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Read data to buffer
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
read_to_buffer()
|
|
|
|
fromfile File to read from
|
|
|
|
buffpek Where to read from
|
|
|
|
sort_length max length to read
|
|
|
|
RESULT
|
|
|
|
> 0 Ammount of bytes read
|
|
|
|
-1 Error
|
|
|
|
*/
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static uint read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
|
2006-04-11 15:45:10 +02:00
|
|
|
uint sort_length)
|
|
|
|
{
|
|
|
|
register uint count;
|
|
|
|
uint length;
|
|
|
|
|
|
|
|
if ((count=(uint) min((ha_rows) buffpek->max_keys,buffpek->count)))
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
if (my_pread(fromfile->file,(uchar*) buffpek->base,
|
2006-04-11 15:45:10 +02:00
|
|
|
(length= sort_length*count),buffpek->file_pos,MYF_RW))
|
|
|
|
return((uint) -1); /* purecov: inspected */
|
|
|
|
buffpek->key=buffpek->base;
|
|
|
|
buffpek->file_pos+= length; /* New filepos */
|
|
|
|
buffpek->count-= count;
|
|
|
|
buffpek->mem_count= count;
|
|
|
|
}
|
|
|
|
return (count*sort_length);
|
|
|
|
} /* read_to_buffer */
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static uint read_to_buffer_varlen(IO_CACHE *fromfile, BUFFPEK *buffpek,
|
2006-04-11 15:45:10 +02:00
|
|
|
uint sort_length)
|
|
|
|
{
|
|
|
|
register uint count;
|
|
|
|
uint16 length_of_key = 0;
|
|
|
|
uint idx;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *buffp;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if ((count=(uint) min((ha_rows) buffpek->max_keys,buffpek->count)))
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
buffp= buffpek->base;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
for (idx=1;idx<=count;idx++)
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
if (my_pread(fromfile->file,(uchar*)&length_of_key,sizeof(length_of_key),
|
2006-04-11 15:45:10 +02:00
|
|
|
buffpek->file_pos,MYF_RW))
|
|
|
|
return((uint) -1);
|
|
|
|
buffpek->file_pos+=sizeof(length_of_key);
|
2007-07-02 19:45:15 +02:00
|
|
|
if (my_pread(fromfile->file,(uchar*) buffp,length_of_key,
|
2006-04-11 15:45:10 +02:00
|
|
|
buffpek->file_pos,MYF_RW))
|
|
|
|
return((uint) -1);
|
|
|
|
buffpek->file_pos+=length_of_key;
|
|
|
|
buffp = buffp + sort_length;
|
|
|
|
}
|
|
|
|
buffpek->key=buffpek->base;
|
|
|
|
buffpek->count-= count;
|
|
|
|
buffpek->mem_count= count;
|
|
|
|
}
|
|
|
|
return (count*sort_length);
|
|
|
|
} /* read_to_buffer_varlen */
|
|
|
|
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_merge_key_varlen(MARIA_SORT_PARAM *info,
|
|
|
|
IO_CACHE *to_file, uchar* key,
|
|
|
|
uint sort_length, uint count)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
uint idx;
|
2007-10-04 19:33:42 +02:00
|
|
|
uchar *bufs = key;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
for (idx=1;idx<=count;idx++)
|
|
|
|
{
|
|
|
|
int err;
|
2007-10-04 19:33:42 +02:00
|
|
|
if ((err= my_var_write(info, to_file, bufs)))
|
2006-04-11 15:45:10 +02:00
|
|
|
return (err);
|
|
|
|
bufs=bufs+sort_length;
|
|
|
|
}
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_merge_key(MARIA_SORT_PARAM *info __attribute__((unused)),
|
|
|
|
IO_CACHE *to_file, uchar *key,
|
2006-04-11 15:45:10 +02:00
|
|
|
uint sort_length, uint count)
|
|
|
|
{
|
2007-10-04 19:33:42 +02:00
|
|
|
return my_b_write(to_file, key, (size_t) sort_length*count);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Merge buffers to one buffer
|
|
|
|
If to_file == 0 then use info->key_write
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int NEAR_F
|
|
|
|
merge_buffers(MARIA_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
|
2007-07-02 19:45:15 +02:00
|
|
|
IO_CACHE *to_file, uchar **sort_keys, BUFFPEK *lastbuff,
|
2006-04-11 15:45:10 +02:00
|
|
|
BUFFPEK *Fb, BUFFPEK *Tb)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
uint sort_length,maxcount;
|
|
|
|
ha_rows count;
|
|
|
|
my_off_t to_start_filepos;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *strpos;
|
2006-04-11 15:45:10 +02:00
|
|
|
BUFFPEK *buffpek,**refpek;
|
|
|
|
QUEUE queue;
|
|
|
|
volatile int *killed= _ma_killed_ptr(info->sort_info->param);
|
|
|
|
DBUG_ENTER("merge_buffers");
|
|
|
|
|
|
|
|
count=error=0;
|
|
|
|
maxcount=keys/((uint) (Tb-Fb) +1);
|
2008-04-01 16:57:30 +02:00
|
|
|
DBUG_ASSERT(maxcount > 0);
|
2006-04-11 15:45:10 +02:00
|
|
|
LINT_INIT(to_start_filepos);
|
|
|
|
if (to_file)
|
|
|
|
to_start_filepos=my_b_tell(to_file);
|
2007-07-02 19:45:15 +02:00
|
|
|
strpos= (uchar*) sort_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
sort_length=info->key_length;
|
|
|
|
|
|
|
|
if (init_queue(&queue,(uint) (Tb-Fb)+1,offsetof(BUFFPEK,key),0,
|
2007-07-02 19:45:15 +02:00
|
|
|
(int (*)(void*, uchar *,uchar*)) info->key_cmp,
|
2006-04-11 15:45:10 +02:00
|
|
|
(void*) info))
|
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
|
|
|
|
|
|
for (buffpek= Fb ; buffpek <= Tb ; buffpek++)
|
|
|
|
{
|
|
|
|
count+= buffpek->count;
|
|
|
|
buffpek->base= strpos;
|
|
|
|
buffpek->max_keys=maxcount;
|
|
|
|
strpos+= (uint) (error=(int) info->read_to_buffer(from_file,buffpek,
|
|
|
|
sort_length));
|
|
|
|
if (error == -1)
|
|
|
|
goto err; /* purecov: inspected */
|
2007-10-04 19:33:42 +02:00
|
|
|
queue_insert(&queue,(uchar*) buffpek);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
while (queue.elements > 1)
|
|
|
|
{
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
if (*killed)
|
|
|
|
{
|
|
|
|
error=1; goto err;
|
|
|
|
}
|
|
|
|
buffpek=(BUFFPEK*) queue_top(&queue);
|
|
|
|
if (to_file)
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
if (info->write_key(info,to_file,(uchar*) buffpek->key,
|
2006-04-11 15:45:10 +02:00
|
|
|
(uint) sort_length,1))
|
|
|
|
{
|
|
|
|
error=1; goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ((*info->key_write)(info,(void*) buffpek->key))
|
|
|
|
{
|
|
|
|
error=1; goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buffpek->key+=sort_length;
|
|
|
|
if (! --buffpek->mem_count)
|
|
|
|
{
|
|
|
|
if (!(error=(int) info->read_to_buffer(from_file,buffpek,sort_length)))
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *base= buffpek->base;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint max_keys=buffpek->max_keys;
|
|
|
|
|
|
|
|
VOID(queue_remove(&queue,0));
|
|
|
|
|
|
|
|
/* Put room used by buffer to use in other buffer */
|
|
|
|
for (refpek= (BUFFPEK**) &queue_top(&queue);
|
|
|
|
refpek <= (BUFFPEK**) &queue_end(&queue);
|
|
|
|
refpek++)
|
|
|
|
{
|
|
|
|
buffpek= *refpek;
|
|
|
|
if (buffpek->base+buffpek->max_keys*sort_length == base)
|
|
|
|
{
|
|
|
|
buffpek->max_keys+=max_keys;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (base+max_keys*sort_length == buffpek->base)
|
|
|
|
{
|
|
|
|
buffpek->base=base;
|
|
|
|
buffpek->max_keys+=max_keys;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break; /* One buffer have been removed */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (error == -1)
|
|
|
|
goto err; /* purecov: inspected */
|
|
|
|
queue_replaced(&queue); /* Top element has been replaced */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buffpek=(BUFFPEK*) queue_top(&queue);
|
2007-07-02 19:45:15 +02:00
|
|
|
buffpek->base= (uchar*) sort_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
buffpek->max_keys=keys;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (to_file)
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
if (info->write_key(info,to_file,(uchar*) buffpek->key,
|
2006-04-11 15:45:10 +02:00
|
|
|
sort_length,buffpek->mem_count))
|
|
|
|
{
|
|
|
|
error=1; goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
register uchar *end;
|
2006-04-11 15:45:10 +02:00
|
|
|
strpos= buffpek->key;
|
2007-01-18 20:38:14 +01:00
|
|
|
for (end= strpos+buffpek->mem_count*sort_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
strpos != end ;
|
|
|
|
strpos+=sort_length)
|
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
if ((*info->key_write)(info, (uchar*) strpos))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
error=1; goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-01-18 20:38:14 +01:00
|
|
|
while ((error=(int) info->read_to_buffer(from_file,buffpek,sort_length)) !=
|
|
|
|
-1 && error != 0);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
lastbuff->count=count;
|
|
|
|
if (to_file)
|
|
|
|
lastbuff->file_pos=to_start_filepos;
|
|
|
|
err:
|
|
|
|
delete_queue(&queue);
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
} /* merge_buffers */
|
|
|
|
|
|
|
|
|
|
|
|
/* Do a merge to output-file (save only positions) */
|
|
|
|
|
|
|
|
static int NEAR_F
|
2007-07-02 19:45:15 +02:00
|
|
|
merge_index(MARIA_SORT_PARAM *info, uint keys, uchar **sort_keys,
|
2006-04-11 15:45:10 +02:00
|
|
|
BUFFPEK *buffpek, int maxbuffer, IO_CACHE *tempfile)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("merge_index");
|
|
|
|
if (merge_buffers(info,keys,tempfile,(IO_CACHE*) 0,sort_keys,buffpek,buffpek,
|
|
|
|
buffpek+maxbuffer))
|
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
} /* merge_index */
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
|
|
|
|
static int flush_maria_ft_buf(MARIA_SORT_PARAM *info)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
int err=0;
|
|
|
|
if (info->sort_info->ft_buf)
|
|
|
|
{
|
|
|
|
err=_ma_sort_ft_buf_flush(info);
|
2007-07-02 19:45:15 +02:00
|
|
|
my_free((uchar*)info->sort_info->ft_buf, MYF(0));
|
2006-04-11 15:45:10 +02:00
|
|
|
info->sort_info->ft_buf=0;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|