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
|
Update FSF address
This commit is based on the work of Michal Schorm, rebased on the
earliest MariaDB version.
Th command line used to generate this diff was:
find ./ -type f \
-exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
-exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
-exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \
-exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \
-exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \
-exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
2019-05-10 19:49:46 +02:00
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
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"
|
2014-01-22 15:29:36 +01:00
|
|
|
#include <my_check_opt.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 DISK_BUFFER_SIZE
|
|
|
|
|
|
|
|
#define MERGEBUFF 15
|
|
|
|
#define MERGEBUFF2 31
|
|
|
|
#define MIN_SORT_MEMORY (4096-MALLOC_OVERHEAD)
|
2013-05-10 11:32:34 +02:00
|
|
|
#define DISK_BUFFER_SIZE (IO_SIZE*128)
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
/* How many keys we can keep in memory */
|
|
|
|
typedef ulonglong ha_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Pointers of functions for store and read keys from temp file
|
|
|
|
*/
|
|
|
|
|
2011-04-25 17:22:25 +02:00
|
|
|
extern void print_error(const char *fmt,...);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
/* Functions defined in this file */
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
static ha_rows find_all_keys(MARIA_SORT_PARAM *info, ha_keys keys,
|
2007-10-04 19:33:42 +02:00
|
|
|
uchar **sort_keys,
|
2013-05-10 11:32:34 +02:00
|
|
|
DYNAMIC_ARRAY *buffpek,uint *maxbuffer,
|
2007-10-04 19:33:42 +02:00
|
|
|
IO_CACHE *tempfile,
|
|
|
|
IO_CACHE *tempfile_for_exceptions);
|
2013-05-10 11:32:34 +02:00
|
|
|
static int write_keys(MARIA_SORT_PARAM *info,uchar **sort_keys,
|
|
|
|
ha_keys count, BUFFPEK *buffpek,IO_CACHE *tempfile);
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_key(MARIA_SORT_PARAM *info, uchar *key,
|
|
|
|
IO_CACHE *tempfile);
|
|
|
|
static int write_index(MARIA_SORT_PARAM *info, uchar **sort_keys,
|
2013-05-10 11:32:34 +02:00
|
|
|
ha_keys count);
|
|
|
|
static int merge_many_buff(MARIA_SORT_PARAM *info, ha_keys keys,
|
2007-10-04 19:33:42 +02:00
|
|
|
uchar **sort_keys,
|
2013-05-10 11:32:34 +02:00
|
|
|
BUFFPEK *buffpek, uint *maxbuffer,
|
2007-10-04 19:33:42 +02:00
|
|
|
IO_CACHE *t_file);
|
2013-05-10 11:32:34 +02:00
|
|
|
static my_off_t read_to_buffer(IO_CACHE *fromfile,BUFFPEK *buffpek,
|
|
|
|
uint sort_length);
|
|
|
|
static int merge_buffers(MARIA_SORT_PARAM *info, ha_keys keys,
|
2007-10-04 19:33:42 +02:00
|
|
|
IO_CACHE *from_file, IO_CACHE *to_file,
|
|
|
|
uchar **sort_keys, BUFFPEK *lastbuff,
|
|
|
|
BUFFPEK *Fb, BUFFPEK *Tb);
|
2013-05-10 11:32:34 +02:00
|
|
|
static int merge_index(MARIA_SORT_PARAM *,ha_keys,uchar **,BUFFPEK *, uint,
|
2007-10-04 19:33:42 +02:00
|
|
|
IO_CACHE *);
|
2006-04-11 15:45:10 +02:00
|
|
|
static int flush_maria_ft_buf(MARIA_SORT_PARAM *info);
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
static int write_keys_varlen(MARIA_SORT_PARAM *info,uchar **sort_keys,
|
|
|
|
ha_keys count, BUFFPEK *buffpek,
|
2007-10-04 19:33:42 +02:00
|
|
|
IO_CACHE *tempfile);
|
2013-05-10 11:32:34 +02:00
|
|
|
static my_off_t read_to_buffer_varlen(IO_CACHE *fromfile,BUFFPEK *buffpek,
|
|
|
|
uint sort_length);
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_merge_key(MARIA_SORT_PARAM *info, IO_CACHE *to_file,
|
2013-05-10 11:32:34 +02:00
|
|
|
uchar *key, uint sort_length, ha_keys count);
|
2007-10-04 19:33:42 +02:00
|
|
|
static int write_merge_key_varlen(MARIA_SORT_PARAM *info,
|
2013-05-10 11:32:34 +02:00
|
|
|
IO_CACHE *to_file,
|
|
|
|
uchar* key, uint sort_length,
|
|
|
|
ha_keys 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
|
|
|
|
2016-02-16 15:15:22 +01:00
|
|
|
/*
|
|
|
|
Sets the appropriate read and write methods for the MARIA_SORT_PARAM
|
|
|
|
based on the variable length key flag.
|
|
|
|
*/
|
|
|
|
static void set_sort_param_read_write(MARIA_SORT_PARAM *sort_param)
|
|
|
|
{
|
|
|
|
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
|
|
|
/*
|
|
|
|
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
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
int error;
|
|
|
|
uint sort_length, maxbuffer;
|
|
|
|
size_t memavl, old_memavl;
|
2006-04-11 15:45:10 +02:00
|
|
|
DYNAMIC_ARRAY buffpek;
|
2015-02-10 11:05:49 +01:00
|
|
|
ha_rows records, UNINIT_VAR(keys);
|
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
|
|
|
|
2016-02-16 15:15:22 +01:00
|
|
|
set_sort_param_read_write(info);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
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;
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
memavl=MY_MAX(sortbuff_size,MIN_SORT_MEMORY);
|
2006-04-11 15:45:10 +02:00
|
|
|
records= info->sort_info->max_records;
|
|
|
|
sort_length= info->key_length;
|
|
|
|
|
|
|
|
while (memavl >= MIN_SORT_MEMORY)
|
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
/* Check if we can fit all keys into memory */
|
|
|
|
if (((ulonglong) (records + 1) *
|
|
|
|
(sort_length + sizeof(char*)) <= memavl))
|
|
|
|
keys= records+1;
|
|
|
|
else if ((info->sort_info->param->testflag &
|
|
|
|
(T_FORCE_SORT_MEMORY | T_CREATE_MISSING_KEYS)) ==
|
|
|
|
T_FORCE_SORT_MEMORY)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Use all of the given sort buffer for key data.
|
|
|
|
Allocate 1000 buffers at a start for new data. More buffers
|
|
|
|
will be allocated when needed.
|
|
|
|
*/
|
|
|
|
keys= memavl / (sort_length+sizeof(char*));
|
2013-07-21 16:39:19 +02:00
|
|
|
maxbuffer= (uint) MY_MIN((ulonglong) 1000, (records / keys)+1);
|
2013-05-10 11:32:34 +02:00
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
else
|
2013-05-10 11:32:34 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
All keys can't fit in memory.
|
|
|
|
Calculate how many keys + buffers we can keep in memory
|
|
|
|
*/
|
|
|
|
uint maxbuffer_org;
|
2006-04-11 15:45:10 +02:00
|
|
|
do
|
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
maxbuffer_org= maxbuffer;
|
|
|
|
if (memavl < sizeof(BUFFPEK) * maxbuffer ||
|
|
|
|
(keys= (memavl-sizeof(BUFFPEK)*maxbuffer)/
|
2006-12-19 19:15:53 +01:00
|
|
|
(sort_length+sizeof(char*))) <= 1 ||
|
2013-05-10 11:32:34 +02:00
|
|
|
keys < maxbuffer)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
_ma_check_print_error(info->sort_info->param,
|
2013-05-10 11:32:34 +02:00
|
|
|
"aria_sort_buffer_size is too small. Current aria_sort_buffer_size: %llu rows: %llu sort_length: %u",
|
|
|
|
(ulonglong) sortbuff_size, (ulonglong) records,
|
|
|
|
sort_length);
|
|
|
|
my_errno= ENOMEM;
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
2013-05-10 11:32:34 +02:00
|
|
|
while ((maxbuffer= (uint) (records/(keys-1)+1)) != maxbuffer_org);
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2016-06-24 01:25:14 +02:00
|
|
|
if ((sort_keys= ((uchar**)
|
|
|
|
my_malloc((size_t) (keys*(sort_length+sizeof(char*))+
|
|
|
|
HA_FT_MAXBYTELEN),
|
|
|
|
MYF(0)))))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (my_init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer,
|
2013-07-21 16:39:19 +02:00
|
|
|
MY_MIN(maxbuffer/2, 1000), MYF(0)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2011-04-25 17:22:25 +02:00
|
|
|
my_free(sort_keys);
|
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)
|
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
/* purecov: begin inspected */
|
|
|
|
_ma_check_print_error(info->sort_info->param,
|
|
|
|
"aria_sort_buffer_size is too small. Current aria_sort_buffer_size: %llu rows: %llu sort_length: %u",
|
|
|
|
(ulonglong) sortbuff_size, (ulonglong) records, sort_length);
|
|
|
|
my_errno= ENOMEM;
|
|
|
|
goto err;
|
|
|
|
/* purecov: end inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
(*info->lock_in_memory)(info->sort_info->param);/* Everything is allocated */
|
|
|
|
|
|
|
|
if (!no_messages)
|
2013-05-10 11:32:34 +02:00
|
|
|
my_fprintf(stdout,
|
|
|
|
" - Searching for keys, allocating buffer for %llu keys\n",
|
|
|
|
(ulonglong) keys);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
if ((records=find_all_keys(info,keys,sort_keys,&buffpek,&maxbuffer,
|
|
|
|
&tempfile,&tempfile_for_exceptions))
|
|
|
|
== HA_POS_ERROR)
|
|
|
|
goto err; /* purecov: tested */
|
2011-07-01 14:08:30 +02:00
|
|
|
|
|
|
|
info->sort_info->param->stage++; /* Merge stage */
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
if (maxbuffer == 0)
|
|
|
|
{
|
|
|
|
if (!no_messages)
|
2013-05-10 11:32:34 +02:00
|
|
|
my_fprintf(stdout, " - Dumping %llu keys\n", (ulonglong) records);
|
|
|
|
if (write_index(info, sort_keys, (ha_keys) records))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
keys=(keys*(sort_length+sizeof(char*)))/sort_length;
|
|
|
|
if (maxbuffer >= MERGEBUFF2)
|
|
|
|
{
|
|
|
|
if (!no_messages)
|
2013-05-10 11:32:34 +02:00
|
|
|
my_fprintf(stdout, " - Merging %llu keys\n",
|
|
|
|
(ulonglong) records); /* purecov: tested */
|
2006-04-11 15:45:10 +02:00
|
|
|
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;
|
Added versioning of Maria index
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey
Renamed old info->lastkey to info->lastkey_buff
Use exact key lenghts for keys, not USE_WHOLE_KEY
For partial key searches, use SEARCH_PART_KEY
When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid
Changes done in a lot of files:
- Modified functions to use MARIA_KEY instead of key pointer and key length
- Use keyinfo->root_lock instead of share->key_root_lock[keynr]
- Simplify code by using local variable keyinfo instead if share->keyinfo[i]
- Added #fdef EXTERNAL_LOCKING around removed state elements
- HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid)
- Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it
.bzrignore:
Added missing temporary directory
extra/Makefile.am:
comp_err is now deleted on make distclean
include/maria.h:
Added structure MARIA_KEY, which is used for intern key objects in Maria.
Changed functions to take MARIA_KEY as an argument instead of pointer to packed key.
Changed some functions that always return true or false to my_bool.
Added virtual function make_key() to avoid if in _ma_make_key()
Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster
include/my_base.h:
Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check()
Added SEARCH_INSERT to be used when inserting new keys
Added SEARCH_PART_KEY for partial searches
Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID
Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid
include/my_handler.h:
Make next_flag 32 bit to make sure we can handle all SEARCH_ bits
mysql-test/include/maria_empty_logs.inc:
Read and restore current database; Don't assume we are using mysqltest.
Don't log use databasename to log. Using this include should not cause any result changes.
mysql-test/r/maria-gis-rtree-dynamic.result:
Updated results after adding some check table commands to help pinpoint errors
mysql-test/r/maria-mvcc.result:
New tests
mysql-test/r/maria-purge.result:
New result after adding removal of logs
mysql-test/r/maria-recovery-big.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-bitmap.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-rtree-ft.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria.result:
New tests
mysql-test/r/variables-big.result:
Don't log id as it's not predictable
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result:
Updated results to new binlog results. (Test has not been run in a long time as it requires --big)
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt:
Moved file to ndb replication test directory
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test:
Fixed wrong path to included tests
mysql-test/t/maria-gis-rtree-dynamic.test:
Added some check table commands to help pinpoint errors
mysql-test/t/maria-mvcc.test:
New tests
mysql-test/t/maria-purge.test:
Remove logs to make test results predictable
mysql-test/t/maria.test:
New tests for some possible problems
mysql-test/t/variables-big.test:
Don't log id as it's not predictable
mysys/my_handler.c:
Updated function comment to reflect old code
Changed nextflag to be uint32 to ensure we can have flags > 16 bit
Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored.
Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND
Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag
mysys/my_lock.c:
Fixed wrong test (Found by Guilhem)
scripts/Makefile.am:
Ensure that test programs are deleted by make clean
sql/rpl_rli.cc:
Moved assignment order to fix compiler warning
storage/heap/hp_write.c:
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
storage/maria/Makefile.am:
Remove also maria log files when doing make distclean
storage/maria/ha_maria.cc:
Use 'file->start_state' as default state for transactional tables without versioning
At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows)
In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event.
Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave
storage/maria/ma_blockrec.c:
Updated comment
storage/maria/ma_check.c:
Compact key pages (removes transid) when doing --zerofill
Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn()
Removed not needed argument from get_record_for_key()
Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL
Remove some SPATIAL specific code where the virtual functions can handle this in a general manner
Use info->lastkey_buff instead of info->lastkey
_ma_dpos() -> _ma_row_pos_from_key()
_ma_make_key() -> keyinfo->make_key()
_ma_print_key() -> _ma_print_keydata()
_ma_move_key() -> ma_copy_copy()
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Ensure that data on page doesn't overwrite page checksum position
Use DBUG_DUMP_KEY instead of DBUG_DUMP
Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp()
Fixed check if rowid points outside of BLOCK_RECORD data file
Use info->lastkey_buff instead of key on stack in some safe places
Added #fdef EXTERNAL_LOCKING around removed state elements
storage/maria/ma_close.c:
Use keyinfo->root_lock instead of share->key_root_lock[keynr]
storage/maria/ma_create.c:
Removed assert that is already checked in maria_init()
Force transactinal tables to be of type BLOCK_RECORD
Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD)
Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
storage/maria/ma_dbug.c:
Changed _ma_print_key() to use MARIA_KEY
storage/maria/ma_delete.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
info->lastkey2-> info->lastkey_buff2
Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Use new interface for get_key(), _ma_get_last_key() and others
_ma_dpos() -> ma_row_pos_from_key()
Simplify setting of prev_key in del()
Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid
Treath key pages that may have a transid as if keys would be of variable length
storage/maria/ma_delete_all.c:
Reset history state if maria_delete_all_rows() are called
Update parameters to _ma_update_state_lsns() call
storage/maria/ma_extra.c:
Store and restore info->lastkey
storage/maria/ma_ft_boolean_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ft_nlq_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing)
storage/maria/ma_ft_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ftdefs.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_fulltext.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_init.c:
Check if blocksize is legal
(Moved test here from ma_open())
storage/maria/ma_key.c:
Added functions for storing/reading of transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys
Add transid to keys if table is versioned
Added _ma_copy_key()
storage/maria/ma_key_recover.c:
Add logging of page_flag (holds information if there are keys with transid on page)
Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive
Added lots of DBUG_PRINT()
Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE
storage/maria/ma_key_recover.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_locking.c:
Added new arguments to _ma_update_state_lsns_sub()
storage/maria/ma_loghandler.c:
Fixed all logging of LSN to look similar in DBUG log
Changed if (left != 0) to if (left) as the later is used also later in the code
storage/maria/ma_loghandler.h:
Added new index page operations
storage/maria/ma_open.c:
Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned
This is needed to not get double increments of state.records (one in ma_write.c and on when log is written)
Changed info->lastkey to MARIA_KEY type
Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled)
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Check on open that state.create_trid is correct
Extend share->base.max_key_length in case of transactional table so that it can hold transid
Removed 4.0 compatible fulltext key mode as this is not relevant for Maria
Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block
Initialize all new virtual function pointers
Removed storing of state->unique, state->process and store state->create_trid instead
storage/maria/ma_page.c:
Added comment to describe key page structure
Added functions to compact key page and log the compact operation
storage/maria/ma_range.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search
Added handling of pages with transid
storage/maria/ma_recovery.c:
Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rename.c:
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rkey.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Don't use USE_WHOLE_KEY, use real length of key
Use share->row_is_visible() to test if row is visible
Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once
Removed test if last_used_keyseg != 0 as this is always true
storage/maria/ma_rnext.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rnext_same.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
lastkey2 -> lastkey_buff2
storage/maria/ma_rprev.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rsame.c:
Updated comment
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rsamepos.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_index.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use better variable names
Removed not needed casts
_ma_dpos() -> _ma_row_pos_from_key()
Use info->last_rtree_keypos to save position to key instead of info->int_keypos
Simplify err: condition
Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function
storage/maria/ma_rt_index.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_key.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify maria_rtree_add_key by combining idenitcal code and removing added_len
storage/maria/ma_rt_key.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_mbr.c:
Changed type of 'nextflag' to uint32
Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value
storage/maria/ma_rt_mbr.h:
Changed type of 'nextflag' to uint32
storage/maria/ma_rt_split.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
key_length -> key_data_length to catch possible errors
storage/maria/ma_rt_test.c:
Fixed wrong comment
Reset recinfo to avoid valgrind varnings
Fixed wrong argument to create_record() that caused test to fail
storage/maria/ma_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added support of keys with optional trid
Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads
_ma_dpos() -> _ma_row_pos_from_key()
If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search()
Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data)
Combine similar code at end of _ma_get_binary_pack_key()
Removed not used function _ma_move_key()
In _ma_search_next() don't call _ma_search() if we aren't on a nod page.
Update info->cur_row.trid with trid for found key
Removed some not needed casts
Added _ma_trid_from_key()
Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller
storage/maria/ma_sort.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_sp_defs.h:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
storage/maria/ma_sp_key.c:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
Don't test sizeof(double), test against 8 as we are using float8store()
Use mi_float8store() instead of doing swap of value (same thing but faster)
storage/maria/ma_state.c:
maria_versioning() now only calls _ma_block_get_status() if table supports versioning
Added _ma_row_visible_xxx() functions for different occasions
When emptying history, set info->state to point to the first history event.
storage/maria/ma_state.h:
Added _ma_row_visible_xxx() prototypes
storage/maria/ma_static.c:
Indentation changes
storage/maria/ma_statrec.c:
Fixed arguments to _ma_dpointer() and _ma_rec_pos()
storage/maria/ma_test1.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_test2.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_unique.c:
Modified functions to use MARIA_KEY
storage/maria/ma_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_write.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
In _ma_enlarge_root(), mark in page_flag if new key has transid
_ma_dpos() -> _ma_row_pos_from_key()
Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not
Moved 'reversed' to outside block as area was used later
storage/maria/maria_chk.c:
Added error if trying to sort with HA_BINARY_PACK_KEY
Use new interface to get_key() and _ma_dpointer()
_ma_dpos() -> _ma_row_pos_from_key()
storage/maria/maria_def.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning
Added create_trid to MARIA_SHARE
Removed not used state variables 'process' and 'unique'
Added defines for handling TRID's in index pages
Changed to use MARIA_SHARE instead of MARIA_HA for some functions
Added 'have_versioning' flag if table supports versioning
Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF
Changed last_key to be of type MARIA_KEY. Removed lastkey_length
lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2
Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read
Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key
Changed 'nextflag' and assocaited variables to uint32
storage/maria/maria_ftdump.c:
lastkey -> lastkey_buff
storage/maria/trnman.c:
Fixed wrong initialization of min_read_from and max_commit_trid
Added trnman_get_min_safe_trid()
storage/maria/unittest/ma_test_all-t:
Added --start-from
storage/myisam/mi_check.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_delete.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_range.c:
Updated comment
storage/myisam/mi_write.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/rt_index.c:
Fixed wrong parameter to rtree_get_req() which could cause crash
2008-06-26 07:18:28 +02:00
|
|
|
uint16 key_length;
|
|
|
|
MARIA_KEY key;
|
|
|
|
key.keyinfo= idx->s->keyinfo + info->key;
|
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))
|
|
|
|
{
|
Added versioning of Maria index
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey
Renamed old info->lastkey to info->lastkey_buff
Use exact key lenghts for keys, not USE_WHOLE_KEY
For partial key searches, use SEARCH_PART_KEY
When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid
Changes done in a lot of files:
- Modified functions to use MARIA_KEY instead of key pointer and key length
- Use keyinfo->root_lock instead of share->key_root_lock[keynr]
- Simplify code by using local variable keyinfo instead if share->keyinfo[i]
- Added #fdef EXTERNAL_LOCKING around removed state elements
- HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid)
- Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it
.bzrignore:
Added missing temporary directory
extra/Makefile.am:
comp_err is now deleted on make distclean
include/maria.h:
Added structure MARIA_KEY, which is used for intern key objects in Maria.
Changed functions to take MARIA_KEY as an argument instead of pointer to packed key.
Changed some functions that always return true or false to my_bool.
Added virtual function make_key() to avoid if in _ma_make_key()
Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster
include/my_base.h:
Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check()
Added SEARCH_INSERT to be used when inserting new keys
Added SEARCH_PART_KEY for partial searches
Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID
Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid
include/my_handler.h:
Make next_flag 32 bit to make sure we can handle all SEARCH_ bits
mysql-test/include/maria_empty_logs.inc:
Read and restore current database; Don't assume we are using mysqltest.
Don't log use databasename to log. Using this include should not cause any result changes.
mysql-test/r/maria-gis-rtree-dynamic.result:
Updated results after adding some check table commands to help pinpoint errors
mysql-test/r/maria-mvcc.result:
New tests
mysql-test/r/maria-purge.result:
New result after adding removal of logs
mysql-test/r/maria-recovery-big.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-bitmap.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-rtree-ft.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria.result:
New tests
mysql-test/r/variables-big.result:
Don't log id as it's not predictable
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result:
Updated results to new binlog results. (Test has not been run in a long time as it requires --big)
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt:
Moved file to ndb replication test directory
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test:
Fixed wrong path to included tests
mysql-test/t/maria-gis-rtree-dynamic.test:
Added some check table commands to help pinpoint errors
mysql-test/t/maria-mvcc.test:
New tests
mysql-test/t/maria-purge.test:
Remove logs to make test results predictable
mysql-test/t/maria.test:
New tests for some possible problems
mysql-test/t/variables-big.test:
Don't log id as it's not predictable
mysys/my_handler.c:
Updated function comment to reflect old code
Changed nextflag to be uint32 to ensure we can have flags > 16 bit
Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored.
Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND
Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag
mysys/my_lock.c:
Fixed wrong test (Found by Guilhem)
scripts/Makefile.am:
Ensure that test programs are deleted by make clean
sql/rpl_rli.cc:
Moved assignment order to fix compiler warning
storage/heap/hp_write.c:
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
storage/maria/Makefile.am:
Remove also maria log files when doing make distclean
storage/maria/ha_maria.cc:
Use 'file->start_state' as default state for transactional tables without versioning
At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows)
In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event.
Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave
storage/maria/ma_blockrec.c:
Updated comment
storage/maria/ma_check.c:
Compact key pages (removes transid) when doing --zerofill
Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn()
Removed not needed argument from get_record_for_key()
Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL
Remove some SPATIAL specific code where the virtual functions can handle this in a general manner
Use info->lastkey_buff instead of info->lastkey
_ma_dpos() -> _ma_row_pos_from_key()
_ma_make_key() -> keyinfo->make_key()
_ma_print_key() -> _ma_print_keydata()
_ma_move_key() -> ma_copy_copy()
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Ensure that data on page doesn't overwrite page checksum position
Use DBUG_DUMP_KEY instead of DBUG_DUMP
Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp()
Fixed check if rowid points outside of BLOCK_RECORD data file
Use info->lastkey_buff instead of key on stack in some safe places
Added #fdef EXTERNAL_LOCKING around removed state elements
storage/maria/ma_close.c:
Use keyinfo->root_lock instead of share->key_root_lock[keynr]
storage/maria/ma_create.c:
Removed assert that is already checked in maria_init()
Force transactinal tables to be of type BLOCK_RECORD
Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD)
Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
storage/maria/ma_dbug.c:
Changed _ma_print_key() to use MARIA_KEY
storage/maria/ma_delete.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
info->lastkey2-> info->lastkey_buff2
Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Use new interface for get_key(), _ma_get_last_key() and others
_ma_dpos() -> ma_row_pos_from_key()
Simplify setting of prev_key in del()
Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid
Treath key pages that may have a transid as if keys would be of variable length
storage/maria/ma_delete_all.c:
Reset history state if maria_delete_all_rows() are called
Update parameters to _ma_update_state_lsns() call
storage/maria/ma_extra.c:
Store and restore info->lastkey
storage/maria/ma_ft_boolean_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ft_nlq_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing)
storage/maria/ma_ft_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ftdefs.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_fulltext.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_init.c:
Check if blocksize is legal
(Moved test here from ma_open())
storage/maria/ma_key.c:
Added functions for storing/reading of transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys
Add transid to keys if table is versioned
Added _ma_copy_key()
storage/maria/ma_key_recover.c:
Add logging of page_flag (holds information if there are keys with transid on page)
Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive
Added lots of DBUG_PRINT()
Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE
storage/maria/ma_key_recover.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_locking.c:
Added new arguments to _ma_update_state_lsns_sub()
storage/maria/ma_loghandler.c:
Fixed all logging of LSN to look similar in DBUG log
Changed if (left != 0) to if (left) as the later is used also later in the code
storage/maria/ma_loghandler.h:
Added new index page operations
storage/maria/ma_open.c:
Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned
This is needed to not get double increments of state.records (one in ma_write.c and on when log is written)
Changed info->lastkey to MARIA_KEY type
Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled)
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Check on open that state.create_trid is correct
Extend share->base.max_key_length in case of transactional table so that it can hold transid
Removed 4.0 compatible fulltext key mode as this is not relevant for Maria
Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block
Initialize all new virtual function pointers
Removed storing of state->unique, state->process and store state->create_trid instead
storage/maria/ma_page.c:
Added comment to describe key page structure
Added functions to compact key page and log the compact operation
storage/maria/ma_range.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search
Added handling of pages with transid
storage/maria/ma_recovery.c:
Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rename.c:
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rkey.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Don't use USE_WHOLE_KEY, use real length of key
Use share->row_is_visible() to test if row is visible
Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once
Removed test if last_used_keyseg != 0 as this is always true
storage/maria/ma_rnext.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rnext_same.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
lastkey2 -> lastkey_buff2
storage/maria/ma_rprev.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rsame.c:
Updated comment
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rsamepos.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_index.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use better variable names
Removed not needed casts
_ma_dpos() -> _ma_row_pos_from_key()
Use info->last_rtree_keypos to save position to key instead of info->int_keypos
Simplify err: condition
Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function
storage/maria/ma_rt_index.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_key.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify maria_rtree_add_key by combining idenitcal code and removing added_len
storage/maria/ma_rt_key.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_mbr.c:
Changed type of 'nextflag' to uint32
Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value
storage/maria/ma_rt_mbr.h:
Changed type of 'nextflag' to uint32
storage/maria/ma_rt_split.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
key_length -> key_data_length to catch possible errors
storage/maria/ma_rt_test.c:
Fixed wrong comment
Reset recinfo to avoid valgrind varnings
Fixed wrong argument to create_record() that caused test to fail
storage/maria/ma_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added support of keys with optional trid
Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads
_ma_dpos() -> _ma_row_pos_from_key()
If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search()
Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data)
Combine similar code at end of _ma_get_binary_pack_key()
Removed not used function _ma_move_key()
In _ma_search_next() don't call _ma_search() if we aren't on a nod page.
Update info->cur_row.trid with trid for found key
Removed some not needed casts
Added _ma_trid_from_key()
Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller
storage/maria/ma_sort.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_sp_defs.h:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
storage/maria/ma_sp_key.c:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
Don't test sizeof(double), test against 8 as we are using float8store()
Use mi_float8store() instead of doing swap of value (same thing but faster)
storage/maria/ma_state.c:
maria_versioning() now only calls _ma_block_get_status() if table supports versioning
Added _ma_row_visible_xxx() functions for different occasions
When emptying history, set info->state to point to the first history event.
storage/maria/ma_state.h:
Added _ma_row_visible_xxx() prototypes
storage/maria/ma_static.c:
Indentation changes
storage/maria/ma_statrec.c:
Fixed arguments to _ma_dpointer() and _ma_rec_pos()
storage/maria/ma_test1.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_test2.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_unique.c:
Modified functions to use MARIA_KEY
storage/maria/ma_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_write.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
In _ma_enlarge_root(), mark in page_flag if new key has transid
_ma_dpos() -> _ma_row_pos_from_key()
Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not
Moved 'reversed' to outside block as area was used later
storage/maria/maria_chk.c:
Added error if trying to sort with HA_BINARY_PACK_KEY
Use new interface to get_key() and _ma_dpointer()
_ma_dpos() -> _ma_row_pos_from_key()
storage/maria/maria_def.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning
Added create_trid to MARIA_SHARE
Removed not used state variables 'process' and 'unique'
Added defines for handling TRID's in index pages
Changed to use MARIA_SHARE instead of MARIA_HA for some functions
Added 'have_versioning' flag if table supports versioning
Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF
Changed last_key to be of type MARIA_KEY. Removed lastkey_length
lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2
Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read
Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key
Changed 'nextflag' and assocaited variables to uint32
storage/maria/maria_ftdump.c:
lastkey -> lastkey_buff
storage/maria/trnman.c:
Fixed wrong initialization of min_read_from and max_commit_trid
Added trnman_get_min_safe_trid()
storage/maria/unittest/ma_test_all-t:
Added --start-from
storage/myisam/mi_check.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_delete.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_range.c:
Updated comment
storage/myisam/mi_write.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/rt_index.c:
Fixed wrong parameter to rtree_get_req() which could cause crash
2008-06-26 07:18:28 +02:00
|
|
|
key.data= (uchar*) sort_keys;
|
|
|
|
key.ref_length= idx->s->rec_reflength;
|
|
|
|
key.data_length= key_length - key.ref_length;
|
|
|
|
key.flag= 0;
|
|
|
|
if (_ma_ck_write(idx, &key))
|
|
|
|
goto err;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
error =0;
|
|
|
|
|
|
|
|
err:
|
2011-04-25 17:22:25 +02:00
|
|
|
my_free(sort_keys);
|
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 */
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
static ha_rows find_all_keys(MARIA_SORT_PARAM *info, ha_rows keys,
|
2009-01-09 05:23:25 +01:00
|
|
|
uchar **sort_keys, DYNAMIC_ARRAY *buffpek,
|
2013-05-10 11:32:34 +02:00
|
|
|
uint *maxbuffer, IO_CACHE *tempfile,
|
2009-01-09 05:23:25 +01:00
|
|
|
IO_CACHE *tempfile_for_exceptions)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
int error;
|
2013-05-10 11:32:34 +02:00
|
|
|
ha_rows idx;
|
2006-04-11 15:45:10 +02:00
|
|
|
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
|
|
|
|
2011-01-07 16:58:12 +01:00
|
|
|
info->sort_info->info->in_check_table= 1;
|
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))
|
2011-01-07 16:58:12 +01:00
|
|
|
goto err; /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
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))
|
2011-01-07 16:58:12 +01:00
|
|
|
goto err; /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
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)
|
2011-01-07 16:58:12 +01:00
|
|
|
goto err; /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
if (buffpek->elements)
|
|
|
|
{
|
|
|
|
if (info->write_keys(info,sort_keys,idx,(BUFFPEK *)alloc_dynamic(buffpek),
|
2007-01-23 20:13:26 +01:00
|
|
|
tempfile))
|
2011-01-07 16:58:12 +01:00
|
|
|
goto err; /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
*maxbuffer=buffpek->elements-1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*maxbuffer=0;
|
|
|
|
|
2011-01-07 16:58:12 +01:00
|
|
|
info->sort_info->info->in_check_table= 0;
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN((*maxbuffer)*(keys-1)+idx);
|
2011-01-07 16:58:12 +01:00
|
|
|
|
|
|
|
err:
|
|
|
|
info->sort_info->info->in_check_table= 0; /* purecov: inspected */
|
|
|
|
DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
} /* find_all_keys */
|
|
|
|
|
|
|
|
|
2015-12-10 02:56:31 +01:00
|
|
|
static my_bool _ma_thr_find_all_keys_exec(MARIA_SORT_PARAM* sort_param)
|
2016-01-17 21:57:27 +01:00
|
|
|
{
|
2016-06-16 21:04:24 +02:00
|
|
|
int error= 0;
|
2015-12-10 02:56:31 +01:00
|
|
|
ulonglong memavl, old_memavl;
|
2016-01-17 21:57:27 +01:00
|
|
|
longlong sortbuff_size;
|
2015-12-10 02:56:31 +01:00
|
|
|
ha_keys UNINIT_VAR(keys), idx;
|
|
|
|
uint sort_length;
|
|
|
|
uint maxbuffer;
|
2015-12-10 02:56:31 +01:00
|
|
|
uchar **sort_keys= NULL;
|
2016-06-28 22:01:55 +02:00
|
|
|
DBUG_ENTER("_ma_thr_find_all_keys_exec");
|
2016-06-16 17:52:46 +02:00
|
|
|
DBUG_PRINT("enter", ("master: %d", sort_param->master));
|
2016-01-17 21:57:27 +01:00
|
|
|
|
2015-12-10 02:56:31 +01:00
|
|
|
if (sort_param->sort_info->got_error)
|
|
|
|
DBUG_RETURN(TRUE);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2015-12-10 02:56:31 +01:00
|
|
|
set_sort_param_read_write(sort_param);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2015-12-10 02:56:31 +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));
|
2016-06-21 14:11:02 +02:00
|
|
|
bzero((char*) &sort_param->unique, sizeof(sort_param->unique));
|
2006-12-19 19:15:53 +01:00
|
|
|
|
2016-06-21 14:11:02 +02:00
|
|
|
sortbuff_size= sort_param->sortbuff_size;
|
|
|
|
memavl= MY_MAX(sortbuff_size, MIN_SORT_MEMORY);
|
|
|
|
idx= (ha_keys) sort_param->sort_info->max_records;
|
|
|
|
sort_length= sort_param->key_length;
|
|
|
|
maxbuffer= 1;
|
2016-01-17 21:57:27 +01:00
|
|
|
|
2015-12-10 02:56:31 +01:00
|
|
|
while (memavl >= MIN_SORT_MEMORY)
|
|
|
|
{
|
|
|
|
if ((my_off_t) (idx+1)*(sort_length+sizeof(char*)) <= (my_off_t) memavl)
|
|
|
|
keys= idx+1;
|
2016-06-21 14:11:02 +02:00
|
|
|
else if ((sort_param->sort_info->param->testflag &
|
|
|
|
(T_FORCE_SORT_MEMORY | T_CREATE_MISSING_KEYS)) ==
|
|
|
|
T_FORCE_SORT_MEMORY)
|
2015-12-10 02:56:31 +01:00
|
|
|
{
|
2016-06-21 14:11:02 +02:00
|
|
|
/*
|
|
|
|
Use all of the given sort buffer for key data.
|
|
|
|
Allocate 1000 buffers at a start for new data. More buffers
|
|
|
|
will be allocated when needed.
|
|
|
|
*/
|
|
|
|
keys= memavl / (sort_length+sizeof(char*));
|
|
|
|
maxbuffer= (uint) MY_MIN((ulonglong) 1000, (idx / keys)+1);
|
2006-12-19 19:15:53 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-06-21 14:11:02 +02:00
|
|
|
uint maxbuffer_org;
|
2015-12-10 02:56:31 +01:00
|
|
|
do
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2016-06-21 14:11:02 +02:00
|
|
|
maxbuffer_org= maxbuffer;
|
2015-12-10 02:56:31 +01:00
|
|
|
if (memavl < sizeof(BUFFPEK)*maxbuffer ||
|
|
|
|
(keys=(memavl-sizeof(BUFFPEK)*maxbuffer)/
|
|
|
|
(sort_length+sizeof(char*))) <= 1 ||
|
|
|
|
keys < maxbuffer)
|
2016-01-17 21:57:27 +01:00
|
|
|
{
|
2015-12-10 02:56:31 +01:00
|
|
|
_ma_check_print_error(sort_param->sort_info->param,
|
2016-06-21 14:11:02 +02:00
|
|
|
"aria_sort_buffer_size is too small. Current aria_sort_buffer_size: %llu rows: %llu sort_length: %u",
|
|
|
|
sortbuff_size, (ulonglong) idx, sort_length);
|
2015-12-10 02:56:31 +01:00
|
|
|
goto err;
|
2016-01-17 21:57:27 +01:00
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2016-06-21 14:11:02 +02:00
|
|
|
while ((maxbuffer= (uint) (idx/(keys-1)+1)) != maxbuffer_org);
|
2006-12-19 19:15:53 +01:00
|
|
|
}
|
2015-12-10 02:56:31 +01:00
|
|
|
if ((sort_keys= (uchar **)
|
2016-06-30 16:38:05 +02:00
|
|
|
my_malloc((size_t)(keys*(sort_length+sizeof(char*))+
|
2015-12-10 02:56:31 +01:00
|
|
|
((sort_param->keyinfo->flag & HA_FULLTEXT) ?
|
2016-06-30 16:38:05 +02:00
|
|
|
HA_FT_MAXBYTELEN : 0)), MYF(0))))
|
2016-01-17 21:57:27 +01:00
|
|
|
{
|
2015-12-10 02:56:31 +01:00
|
|
|
if (my_init_dynamic_array(&sort_param->buffpek, sizeof(BUFFPEK),
|
2016-06-21 14:11:02 +02:00
|
|
|
maxbuffer, MY_MIN(maxbuffer / 2, 1000), MYF(0)))
|
2015-12-10 02:56:31 +01:00
|
|
|
{
|
|
|
|
my_free(sort_keys);
|
|
|
|
sort_keys= NULL; /* Safety against double free on error. */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
2016-01-17 21:57:27 +01:00
|
|
|
}
|
2015-12-10 02:56:31 +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)
|
|
|
|
{
|
|
|
|
/* purecov: begin inspected */
|
|
|
|
_ma_check_print_error(sort_param->sort_info->param,
|
2016-06-21 14:11:02 +02:00
|
|
|
"aria_sort_buffer_size is too small. Current aria_sort_buffer_size: %llu rows: %llu sort_length: %u",
|
|
|
|
sortbuff_size, (ulonglong) idx, sort_length);
|
2015-12-10 02:56:31 +01:00
|
|
|
my_errno= ENOMEM;
|
|
|
|
goto err;
|
2016-06-21 14:11:02 +02:00
|
|
|
/* purecov: end inspected */
|
2015-12-10 02:56:31 +01:00
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2015-12-10 02:56:31 +01:00
|
|
|
if (sort_param->sort_info->param->testflag & T_VERBOSE)
|
2016-06-21 14:11:02 +02:00
|
|
|
my_fprintf(stdout,
|
|
|
|
"Key %d - Allocating buffer for %llu keys\n",
|
|
|
|
sort_param->key + 1, (ulonglong) keys);
|
2015-12-10 02:56:31 +01:00
|
|
|
sort_param->sort_keys= sort_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2015-12-10 02:56:31 +01:00
|
|
|
idx= error= 0;
|
|
|
|
sort_keys[0]= (uchar*) (sort_keys+keys);
|
2016-01-17 21:57:27 +01:00
|
|
|
|
2015-12-10 02:56:31 +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])))
|
|
|
|
{
|
|
|
|
if (sort_param->real_key_length > sort_param->key_length)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2015-12-10 02:56:31 +01:00
|
|
|
if (write_key(sort_param, sort_keys[idx],
|
|
|
|
&sort_param->tempfile_for_exceptions))
|
|
|
|
goto err;
|
|
|
|
continue;
|
2016-01-17 21:57:27 +01:00
|
|
|
}
|
2015-12-10 02:56:31 +01:00
|
|
|
|
|
|
|
if (++idx == keys)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2015-12-10 02:56:31 +01:00
|
|
|
if (sort_param->write_keys(sort_param, sort_keys, idx - 1,
|
|
|
|
(BUFFPEK *)alloc_dynamic(&sort_param->buffpek),
|
2007-01-23 20:13:26 +01:00
|
|
|
&sort_param->tempfile))
|
2006-04-11 15:45:10 +02:00
|
|
|
goto err;
|
2015-12-10 02:56:31 +01:00
|
|
|
sort_keys[0]= (uchar*) (sort_keys+keys);
|
|
|
|
memcpy(sort_keys[0], sort_keys[idx - 1], (size_t) sort_param->key_length);
|
|
|
|
idx= 1;
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2015-12-10 02:56:31 +01:00
|
|
|
sort_keys[idx]= sort_keys[idx - 1] + sort_param->key_length;
|
|
|
|
}
|
|
|
|
if (error > 0)
|
|
|
|
goto err;
|
|
|
|
if (sort_param->buffpek.elements)
|
|
|
|
{
|
|
|
|
if (sort_param->write_keys(sort_param,sort_keys, idx,
|
|
|
|
(BUFFPEK *) alloc_dynamic(&sort_param->buffpek),
|
|
|
|
&sort_param->tempfile))
|
|
|
|
goto err;
|
2017-09-28 12:38:02 +02:00
|
|
|
sort_param->keys= (uint)((sort_param->buffpek.elements - 1) * (keys - 1) + idx);
|
2015-12-10 02:56:31 +01:00
|
|
|
}
|
|
|
|
else
|
2017-09-28 12:38:02 +02:00
|
|
|
sort_param->keys= (uint)idx;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2015-12-10 02:56:31 +01:00
|
|
|
DBUG_RETURN(FALSE);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
err:
|
2015-12-10 02:56:31 +01:00
|
|
|
DBUG_PRINT("error", ("got some error"));
|
|
|
|
my_free(sort_keys);
|
|
|
|
sort_param->sort_keys= 0;
|
|
|
|
delete_dynamic(& sort_param->buffpek);
|
|
|
|
close_cached_file(&sort_param->tempfile);
|
|
|
|
close_cached_file(&sort_param->tempfile_for_exceptions);
|
|
|
|
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Search after all keys and place them in a temp. file */
|
|
|
|
|
|
|
|
pthread_handler_t _ma_thr_find_all_keys(void *arg)
|
|
|
|
{
|
|
|
|
MARIA_SORT_PARAM *sort_param= (MARIA_SORT_PARAM*) arg;
|
|
|
|
my_bool error= FALSE;
|
|
|
|
/* If my_thread_init fails */
|
|
|
|
if (my_thread_init() || _ma_thr_find_all_keys_exec(sort_param))
|
|
|
|
error= TRUE;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Thread must clean up after itself.
|
|
|
|
*/
|
|
|
|
free_root(&sort_param->wordroot, MYF(0));
|
|
|
|
/*
|
2016-06-21 14:11:02 +02:00
|
|
|
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.
|
|
|
|
That means that a writer always gets here first and readers -
|
|
|
|
only when they see EOF. But if a reader finishes prematurely
|
|
|
|
because of an error it may reach this earlier - don't allow it
|
|
|
|
to detach the writer thread.
|
|
|
|
*/
|
2015-12-10 02:56:31 +01:00
|
|
|
if (sort_param->master && 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);
|
|
|
|
|
|
|
|
mysql_mutex_lock(&sort_param->sort_info->mutex);
|
|
|
|
if (error)
|
|
|
|
sort_param->sort_info->got_error= 1;
|
|
|
|
|
|
|
|
if (!--sort_param->sort_info->threads_running)
|
|
|
|
mysql_cond_signal(&sort_param->sort_info->cond);
|
|
|
|
mysql_mutex_unlock(&sort_param->sort_info->mutex);
|
|
|
|
|
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;
|
2016-06-14 22:29:24 +02:00
|
|
|
size_t UNINIT_VAR(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
|
|
|
|
|
|
|
for (i= 0, sinfo= sort_param ;
|
|
|
|
i < sort_info->total_keys ;
|
2013-05-10 11:32:34 +02:00
|
|
|
i++, sinfo++)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
if (!sinfo->sort_keys)
|
|
|
|
{
|
|
|
|
got_error=1;
|
2011-04-25 17:22:25 +02:00
|
|
|
my_free(sinfo->rec_buff);
|
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)
|
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
my_fprintf(stdout,
|
|
|
|
"Key %d - Dumping %llu keys\n", sinfo->key+1,
|
|
|
|
(ulonglong) sinfo->keys);
|
2006-04-11 15:45:10 +02:00
|
|
|
fflush(stdout);
|
|
|
|
}
|
|
|
|
if (write_index(sinfo, sinfo->sort_keys, sinfo->keys) ||
|
|
|
|
flush_maria_ft_buf(sinfo) || _ma_flush_pending_blocks(sinfo))
|
|
|
|
got_error=1;
|
|
|
|
}
|
|
|
|
}
|
2011-04-25 17:22:25 +02:00
|
|
|
my_free(sinfo->sort_keys);
|
|
|
|
my_free(sinfo->rec_buff);
|
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),
|
2013-05-10 11:32:34 +02:00
|
|
|
rec_per_key_part+= sinfo->keyinfo->keysegs,
|
2006-04-11 15:45:10 +02:00
|
|
|
sinfo++)
|
|
|
|
{
|
|
|
|
if (got_error)
|
|
|
|
continue;
|
2016-02-16 15:15:22 +01:00
|
|
|
|
|
|
|
set_sort_param_read_write(sinfo);
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
if (sinfo->buffpek.elements)
|
|
|
|
{
|
|
|
|
uint maxbuffer=sinfo->buffpek.elements-1;
|
|
|
|
if (!mergebuf)
|
|
|
|
{
|
2017-09-28 12:38:02 +02:00
|
|
|
length=(size_t)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
|
|
|
{
|
2016-06-24 01:25:14 +02:00
|
|
|
if ((mergebuf= my_malloc((size_t) length, MYF(0))))
|
2008-04-01 16:57:30 +02:00
|
|
|
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)
|
2013-05-10 11:32:34 +02:00
|
|
|
my_fprintf(stdout,
|
|
|
|
"Key %d - Merging %llu keys\n",
|
|
|
|
sinfo->key+1, (ulonglong) sinfo->keys);
|
|
|
|
if (merge_many_buff(sinfo, keys, (uchar **)mergebuf,
|
2006-04-11 15:45:10 +02:00
|
|
|
dynamic_element(&sinfo->buffpek, 0, BUFFPEK *),
|
2013-05-10 11:32:34 +02:00
|
|
|
&maxbuffer, &sinfo->tempfile))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
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))
|
|
|
|
{
|
Added versioning of Maria index
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey
Renamed old info->lastkey to info->lastkey_buff
Use exact key lenghts for keys, not USE_WHOLE_KEY
For partial key searches, use SEARCH_PART_KEY
When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid
Changes done in a lot of files:
- Modified functions to use MARIA_KEY instead of key pointer and key length
- Use keyinfo->root_lock instead of share->key_root_lock[keynr]
- Simplify code by using local variable keyinfo instead if share->keyinfo[i]
- Added #fdef EXTERNAL_LOCKING around removed state elements
- HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid)
- Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it
.bzrignore:
Added missing temporary directory
extra/Makefile.am:
comp_err is now deleted on make distclean
include/maria.h:
Added structure MARIA_KEY, which is used for intern key objects in Maria.
Changed functions to take MARIA_KEY as an argument instead of pointer to packed key.
Changed some functions that always return true or false to my_bool.
Added virtual function make_key() to avoid if in _ma_make_key()
Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster
include/my_base.h:
Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check()
Added SEARCH_INSERT to be used when inserting new keys
Added SEARCH_PART_KEY for partial searches
Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID
Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid
include/my_handler.h:
Make next_flag 32 bit to make sure we can handle all SEARCH_ bits
mysql-test/include/maria_empty_logs.inc:
Read and restore current database; Don't assume we are using mysqltest.
Don't log use databasename to log. Using this include should not cause any result changes.
mysql-test/r/maria-gis-rtree-dynamic.result:
Updated results after adding some check table commands to help pinpoint errors
mysql-test/r/maria-mvcc.result:
New tests
mysql-test/r/maria-purge.result:
New result after adding removal of logs
mysql-test/r/maria-recovery-big.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-bitmap.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-rtree-ft.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria.result:
New tests
mysql-test/r/variables-big.result:
Don't log id as it's not predictable
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result:
Updated results to new binlog results. (Test has not been run in a long time as it requires --big)
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt:
Moved file to ndb replication test directory
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test:
Fixed wrong path to included tests
mysql-test/t/maria-gis-rtree-dynamic.test:
Added some check table commands to help pinpoint errors
mysql-test/t/maria-mvcc.test:
New tests
mysql-test/t/maria-purge.test:
Remove logs to make test results predictable
mysql-test/t/maria.test:
New tests for some possible problems
mysql-test/t/variables-big.test:
Don't log id as it's not predictable
mysys/my_handler.c:
Updated function comment to reflect old code
Changed nextflag to be uint32 to ensure we can have flags > 16 bit
Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored.
Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND
Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag
mysys/my_lock.c:
Fixed wrong test (Found by Guilhem)
scripts/Makefile.am:
Ensure that test programs are deleted by make clean
sql/rpl_rli.cc:
Moved assignment order to fix compiler warning
storage/heap/hp_write.c:
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
storage/maria/Makefile.am:
Remove also maria log files when doing make distclean
storage/maria/ha_maria.cc:
Use 'file->start_state' as default state for transactional tables without versioning
At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows)
In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event.
Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave
storage/maria/ma_blockrec.c:
Updated comment
storage/maria/ma_check.c:
Compact key pages (removes transid) when doing --zerofill
Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn()
Removed not needed argument from get_record_for_key()
Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL
Remove some SPATIAL specific code where the virtual functions can handle this in a general manner
Use info->lastkey_buff instead of info->lastkey
_ma_dpos() -> _ma_row_pos_from_key()
_ma_make_key() -> keyinfo->make_key()
_ma_print_key() -> _ma_print_keydata()
_ma_move_key() -> ma_copy_copy()
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Ensure that data on page doesn't overwrite page checksum position
Use DBUG_DUMP_KEY instead of DBUG_DUMP
Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp()
Fixed check if rowid points outside of BLOCK_RECORD data file
Use info->lastkey_buff instead of key on stack in some safe places
Added #fdef EXTERNAL_LOCKING around removed state elements
storage/maria/ma_close.c:
Use keyinfo->root_lock instead of share->key_root_lock[keynr]
storage/maria/ma_create.c:
Removed assert that is already checked in maria_init()
Force transactinal tables to be of type BLOCK_RECORD
Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD)
Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
storage/maria/ma_dbug.c:
Changed _ma_print_key() to use MARIA_KEY
storage/maria/ma_delete.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
info->lastkey2-> info->lastkey_buff2
Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Use new interface for get_key(), _ma_get_last_key() and others
_ma_dpos() -> ma_row_pos_from_key()
Simplify setting of prev_key in del()
Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid
Treath key pages that may have a transid as if keys would be of variable length
storage/maria/ma_delete_all.c:
Reset history state if maria_delete_all_rows() are called
Update parameters to _ma_update_state_lsns() call
storage/maria/ma_extra.c:
Store and restore info->lastkey
storage/maria/ma_ft_boolean_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ft_nlq_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing)
storage/maria/ma_ft_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ftdefs.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_fulltext.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_init.c:
Check if blocksize is legal
(Moved test here from ma_open())
storage/maria/ma_key.c:
Added functions for storing/reading of transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys
Add transid to keys if table is versioned
Added _ma_copy_key()
storage/maria/ma_key_recover.c:
Add logging of page_flag (holds information if there are keys with transid on page)
Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive
Added lots of DBUG_PRINT()
Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE
storage/maria/ma_key_recover.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_locking.c:
Added new arguments to _ma_update_state_lsns_sub()
storage/maria/ma_loghandler.c:
Fixed all logging of LSN to look similar in DBUG log
Changed if (left != 0) to if (left) as the later is used also later in the code
storage/maria/ma_loghandler.h:
Added new index page operations
storage/maria/ma_open.c:
Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned
This is needed to not get double increments of state.records (one in ma_write.c and on when log is written)
Changed info->lastkey to MARIA_KEY type
Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled)
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Check on open that state.create_trid is correct
Extend share->base.max_key_length in case of transactional table so that it can hold transid
Removed 4.0 compatible fulltext key mode as this is not relevant for Maria
Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block
Initialize all new virtual function pointers
Removed storing of state->unique, state->process and store state->create_trid instead
storage/maria/ma_page.c:
Added comment to describe key page structure
Added functions to compact key page and log the compact operation
storage/maria/ma_range.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search
Added handling of pages with transid
storage/maria/ma_recovery.c:
Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rename.c:
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rkey.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Don't use USE_WHOLE_KEY, use real length of key
Use share->row_is_visible() to test if row is visible
Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once
Removed test if last_used_keyseg != 0 as this is always true
storage/maria/ma_rnext.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rnext_same.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
lastkey2 -> lastkey_buff2
storage/maria/ma_rprev.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rsame.c:
Updated comment
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rsamepos.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_index.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use better variable names
Removed not needed casts
_ma_dpos() -> _ma_row_pos_from_key()
Use info->last_rtree_keypos to save position to key instead of info->int_keypos
Simplify err: condition
Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function
storage/maria/ma_rt_index.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_key.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify maria_rtree_add_key by combining idenitcal code and removing added_len
storage/maria/ma_rt_key.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_mbr.c:
Changed type of 'nextflag' to uint32
Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value
storage/maria/ma_rt_mbr.h:
Changed type of 'nextflag' to uint32
storage/maria/ma_rt_split.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
key_length -> key_data_length to catch possible errors
storage/maria/ma_rt_test.c:
Fixed wrong comment
Reset recinfo to avoid valgrind varnings
Fixed wrong argument to create_record() that caused test to fail
storage/maria/ma_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added support of keys with optional trid
Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads
_ma_dpos() -> _ma_row_pos_from_key()
If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search()
Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data)
Combine similar code at end of _ma_get_binary_pack_key()
Removed not used function _ma_move_key()
In _ma_search_next() don't call _ma_search() if we aren't on a nod page.
Update info->cur_row.trid with trid for found key
Removed some not needed casts
Added _ma_trid_from_key()
Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller
storage/maria/ma_sort.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_sp_defs.h:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
storage/maria/ma_sp_key.c:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
Don't test sizeof(double), test against 8 as we are using float8store()
Use mi_float8store() instead of doing swap of value (same thing but faster)
storage/maria/ma_state.c:
maria_versioning() now only calls _ma_block_get_status() if table supports versioning
Added _ma_row_visible_xxx() functions for different occasions
When emptying history, set info->state to point to the first history event.
storage/maria/ma_state.h:
Added _ma_row_visible_xxx() prototypes
storage/maria/ma_static.c:
Indentation changes
storage/maria/ma_statrec.c:
Fixed arguments to _ma_dpointer() and _ma_rec_pos()
storage/maria/ma_test1.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_test2.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_unique.c:
Modified functions to use MARIA_KEY
storage/maria/ma_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_write.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
In _ma_enlarge_root(), mark in page_flag if new key has transid
_ma_dpos() -> _ma_row_pos_from_key()
Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not
Moved 'reversed' to outside block as area was used later
storage/maria/maria_chk.c:
Added error if trying to sort with HA_BINARY_PACK_KEY
Use new interface to get_key() and _ma_dpointer()
_ma_dpos() -> _ma_row_pos_from_key()
storage/maria/maria_def.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning
Added create_trid to MARIA_SHARE
Removed not used state variables 'process' and 'unique'
Added defines for handling TRID's in index pages
Changed to use MARIA_SHARE instead of MARIA_HA for some functions
Added 'have_versioning' flag if table supports versioning
Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF
Changed last_key to be of type MARIA_KEY. Removed lastkey_length
lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2
Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read
Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key
Changed 'nextflag' and assocaited variables to uint32
storage/maria/maria_ftdump.c:
lastkey -> lastkey_buff
storage/maria/trnman.c:
Fixed wrong initialization of min_read_from and max_commit_trid
Added trnman_get_min_safe_trid()
storage/maria/unittest/ma_test_all-t:
Added --start-from
storage/myisam/mi_check.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_delete.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_range.c:
Updated comment
storage/myisam/mi_write.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/rt_index.c:
Fixed wrong parameter to rtree_get_req() which could cause crash
2008-06-26 07:18:28 +02:00
|
|
|
uint16 key_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
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,
|
Added versioning of Maria index
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey
Renamed old info->lastkey to info->lastkey_buff
Use exact key lenghts for keys, not USE_WHOLE_KEY
For partial key searches, use SEARCH_PART_KEY
When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid
Changes done in a lot of files:
- Modified functions to use MARIA_KEY instead of key pointer and key length
- Use keyinfo->root_lock instead of share->key_root_lock[keynr]
- Simplify code by using local variable keyinfo instead if share->keyinfo[i]
- Added #fdef EXTERNAL_LOCKING around removed state elements
- HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid)
- Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it
.bzrignore:
Added missing temporary directory
extra/Makefile.am:
comp_err is now deleted on make distclean
include/maria.h:
Added structure MARIA_KEY, which is used for intern key objects in Maria.
Changed functions to take MARIA_KEY as an argument instead of pointer to packed key.
Changed some functions that always return true or false to my_bool.
Added virtual function make_key() to avoid if in _ma_make_key()
Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster
include/my_base.h:
Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check()
Added SEARCH_INSERT to be used when inserting new keys
Added SEARCH_PART_KEY for partial searches
Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID
Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid
include/my_handler.h:
Make next_flag 32 bit to make sure we can handle all SEARCH_ bits
mysql-test/include/maria_empty_logs.inc:
Read and restore current database; Don't assume we are using mysqltest.
Don't log use databasename to log. Using this include should not cause any result changes.
mysql-test/r/maria-gis-rtree-dynamic.result:
Updated results after adding some check table commands to help pinpoint errors
mysql-test/r/maria-mvcc.result:
New tests
mysql-test/r/maria-purge.result:
New result after adding removal of logs
mysql-test/r/maria-recovery-big.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-bitmap.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-rtree-ft.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria.result:
New tests
mysql-test/r/variables-big.result:
Don't log id as it's not predictable
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result:
Updated results to new binlog results. (Test has not been run in a long time as it requires --big)
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt:
Moved file to ndb replication test directory
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test:
Fixed wrong path to included tests
mysql-test/t/maria-gis-rtree-dynamic.test:
Added some check table commands to help pinpoint errors
mysql-test/t/maria-mvcc.test:
New tests
mysql-test/t/maria-purge.test:
Remove logs to make test results predictable
mysql-test/t/maria.test:
New tests for some possible problems
mysql-test/t/variables-big.test:
Don't log id as it's not predictable
mysys/my_handler.c:
Updated function comment to reflect old code
Changed nextflag to be uint32 to ensure we can have flags > 16 bit
Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored.
Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND
Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag
mysys/my_lock.c:
Fixed wrong test (Found by Guilhem)
scripts/Makefile.am:
Ensure that test programs are deleted by make clean
sql/rpl_rli.cc:
Moved assignment order to fix compiler warning
storage/heap/hp_write.c:
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
storage/maria/Makefile.am:
Remove also maria log files when doing make distclean
storage/maria/ha_maria.cc:
Use 'file->start_state' as default state for transactional tables without versioning
At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows)
In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event.
Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave
storage/maria/ma_blockrec.c:
Updated comment
storage/maria/ma_check.c:
Compact key pages (removes transid) when doing --zerofill
Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn()
Removed not needed argument from get_record_for_key()
Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL
Remove some SPATIAL specific code where the virtual functions can handle this in a general manner
Use info->lastkey_buff instead of info->lastkey
_ma_dpos() -> _ma_row_pos_from_key()
_ma_make_key() -> keyinfo->make_key()
_ma_print_key() -> _ma_print_keydata()
_ma_move_key() -> ma_copy_copy()
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Ensure that data on page doesn't overwrite page checksum position
Use DBUG_DUMP_KEY instead of DBUG_DUMP
Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp()
Fixed check if rowid points outside of BLOCK_RECORD data file
Use info->lastkey_buff instead of key on stack in some safe places
Added #fdef EXTERNAL_LOCKING around removed state elements
storage/maria/ma_close.c:
Use keyinfo->root_lock instead of share->key_root_lock[keynr]
storage/maria/ma_create.c:
Removed assert that is already checked in maria_init()
Force transactinal tables to be of type BLOCK_RECORD
Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD)
Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
storage/maria/ma_dbug.c:
Changed _ma_print_key() to use MARIA_KEY
storage/maria/ma_delete.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
info->lastkey2-> info->lastkey_buff2
Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Use new interface for get_key(), _ma_get_last_key() and others
_ma_dpos() -> ma_row_pos_from_key()
Simplify setting of prev_key in del()
Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid
Treath key pages that may have a transid as if keys would be of variable length
storage/maria/ma_delete_all.c:
Reset history state if maria_delete_all_rows() are called
Update parameters to _ma_update_state_lsns() call
storage/maria/ma_extra.c:
Store and restore info->lastkey
storage/maria/ma_ft_boolean_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ft_nlq_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing)
storage/maria/ma_ft_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ftdefs.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_fulltext.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_init.c:
Check if blocksize is legal
(Moved test here from ma_open())
storage/maria/ma_key.c:
Added functions for storing/reading of transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys
Add transid to keys if table is versioned
Added _ma_copy_key()
storage/maria/ma_key_recover.c:
Add logging of page_flag (holds information if there are keys with transid on page)
Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive
Added lots of DBUG_PRINT()
Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE
storage/maria/ma_key_recover.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_locking.c:
Added new arguments to _ma_update_state_lsns_sub()
storage/maria/ma_loghandler.c:
Fixed all logging of LSN to look similar in DBUG log
Changed if (left != 0) to if (left) as the later is used also later in the code
storage/maria/ma_loghandler.h:
Added new index page operations
storage/maria/ma_open.c:
Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned
This is needed to not get double increments of state.records (one in ma_write.c and on when log is written)
Changed info->lastkey to MARIA_KEY type
Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled)
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Check on open that state.create_trid is correct
Extend share->base.max_key_length in case of transactional table so that it can hold transid
Removed 4.0 compatible fulltext key mode as this is not relevant for Maria
Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block
Initialize all new virtual function pointers
Removed storing of state->unique, state->process and store state->create_trid instead
storage/maria/ma_page.c:
Added comment to describe key page structure
Added functions to compact key page and log the compact operation
storage/maria/ma_range.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search
Added handling of pages with transid
storage/maria/ma_recovery.c:
Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rename.c:
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rkey.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Don't use USE_WHOLE_KEY, use real length of key
Use share->row_is_visible() to test if row is visible
Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once
Removed test if last_used_keyseg != 0 as this is always true
storage/maria/ma_rnext.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rnext_same.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
lastkey2 -> lastkey_buff2
storage/maria/ma_rprev.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rsame.c:
Updated comment
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rsamepos.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_index.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use better variable names
Removed not needed casts
_ma_dpos() -> _ma_row_pos_from_key()
Use info->last_rtree_keypos to save position to key instead of info->int_keypos
Simplify err: condition
Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function
storage/maria/ma_rt_index.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_key.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify maria_rtree_add_key by combining idenitcal code and removing added_len
storage/maria/ma_rt_key.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_mbr.c:
Changed type of 'nextflag' to uint32
Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value
storage/maria/ma_rt_mbr.h:
Changed type of 'nextflag' to uint32
storage/maria/ma_rt_split.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
key_length -> key_data_length to catch possible errors
storage/maria/ma_rt_test.c:
Fixed wrong comment
Reset recinfo to avoid valgrind varnings
Fixed wrong argument to create_record() that caused test to fail
storage/maria/ma_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added support of keys with optional trid
Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads
_ma_dpos() -> _ma_row_pos_from_key()
If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search()
Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data)
Combine similar code at end of _ma_get_binary_pack_key()
Removed not used function _ma_move_key()
In _ma_search_next() don't call _ma_search() if we aren't on a nod page.
Update info->cur_row.trid with trid for found key
Removed some not needed casts
Added _ma_trid_from_key()
Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller
storage/maria/ma_sort.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_sp_defs.h:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
storage/maria/ma_sp_key.c:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
Don't test sizeof(double), test against 8 as we are using float8store()
Use mi_float8store() instead of doing swap of value (same thing but faster)
storage/maria/ma_state.c:
maria_versioning() now only calls _ma_block_get_status() if table supports versioning
Added _ma_row_visible_xxx() functions for different occasions
When emptying history, set info->state to point to the first history event.
storage/maria/ma_state.h:
Added _ma_row_visible_xxx() prototypes
storage/maria/ma_static.c:
Indentation changes
storage/maria/ma_statrec.c:
Fixed arguments to _ma_dpointer() and _ma_rec_pos()
storage/maria/ma_test1.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_test2.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_unique.c:
Modified functions to use MARIA_KEY
storage/maria/ma_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_write.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
In _ma_enlarge_root(), mark in page_flag if new key has transid
_ma_dpos() -> _ma_row_pos_from_key()
Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not
Moved 'reversed' to outside block as area was used later
storage/maria/maria_chk.c:
Added error if trying to sort with HA_BINARY_PACK_KEY
Use new interface to get_key() and _ma_dpointer()
_ma_dpos() -> _ma_row_pos_from_key()
storage/maria/maria_def.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning
Added create_trid to MARIA_SHARE
Removed not used state variables 'process' and 'unique'
Added defines for handling TRID's in index pages
Changed to use MARIA_SHARE instead of MARIA_HA for some functions
Added 'have_versioning' flag if table supports versioning
Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF
Changed last_key to be of type MARIA_KEY. Removed lastkey_length
lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2
Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read
Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key
Changed 'nextflag' and assocaited variables to uint32
storage/maria/maria_ftdump.c:
lastkey -> lastkey_buff
storage/maria/trnman.c:
Fixed wrong initialization of min_read_from and max_commit_trid
Added trnman_get_min_safe_trid()
storage/maria/unittest/ma_test_all-t:
Added --start-from
storage/myisam/mi_check.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_delete.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_range.c:
Updated comment
storage/myisam/mi_write.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/rt_index.c:
Fixed wrong parameter to rtree_get_req() which could cause crash
2008-06-26 07:18:28 +02:00
|
|
|
(uint) key_length))
|
|
|
|
got_error= 1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
MARIA_KEY tmp_key;
|
|
|
|
tmp_key.keyinfo= info->s->keyinfo + sinfo->key;
|
|
|
|
tmp_key.data= maria_ft_buf;
|
|
|
|
tmp_key.ref_length= info->s->rec_reflength;
|
|
|
|
tmp_key.data_length= key_length - info->s->rec_reflength;
|
|
|
|
tmp_key.flag= 0;
|
|
|
|
if (_ma_ck_write(info, &tmp_key))
|
|
|
|
got_error=1;
|
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
2013-05-10 11:32:34 +02:00
|
|
|
if (!got_error && (param->testflag & T_STATISTICS))
|
|
|
|
maria_update_key_parts(sinfo->keyinfo, rec_per_key_part, sinfo->unique,
|
|
|
|
param->stats_method ==
|
|
|
|
MI_STATS_METHOD_IGNORE_NULLS ?
|
|
|
|
sinfo->notnull : NULL,
|
|
|
|
(ulonglong) share->state.state.records);
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2011-04-25 17:22:25 +02:00
|
|
|
my_free(mergebuf);
|
2006-12-19 19:15:53 +01:00
|
|
|
DBUG_RETURN(got_error);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
|
2009-01-09 05:23:25 +01:00
|
|
|
|
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,
|
2013-05-10 11:32:34 +02:00
|
|
|
ha_keys 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");
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
if (!buffpek)
|
|
|
|
DBUG_RETURN(1); /* Out of memory */
|
|
|
|
|
2016-06-24 01:25:14 +02: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
|
|
|
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++)
|
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
if (my_b_write(tempfile, *sort_keys, 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,
|
2013-05-10 11:32:34 +02:00
|
|
|
register uchar **sort_keys,
|
|
|
|
ha_keys 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
|
|
|
int err;
|
|
|
|
DBUG_ENTER("write_keys_varlen");
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
if (!buffpek)
|
|
|
|
DBUG_RETURN(1); /* Out of memory */
|
|
|
|
|
2016-06-24 01:25:14 +02: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
|
|
|
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)
|
|
|
|
{
|
Added versioning of Maria index
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey
Renamed old info->lastkey to info->lastkey_buff
Use exact key lenghts for keys, not USE_WHOLE_KEY
For partial key searches, use SEARCH_PART_KEY
When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid
Changes done in a lot of files:
- Modified functions to use MARIA_KEY instead of key pointer and key length
- Use keyinfo->root_lock instead of share->key_root_lock[keynr]
- Simplify code by using local variable keyinfo instead if share->keyinfo[i]
- Added #fdef EXTERNAL_LOCKING around removed state elements
- HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid)
- Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it
.bzrignore:
Added missing temporary directory
extra/Makefile.am:
comp_err is now deleted on make distclean
include/maria.h:
Added structure MARIA_KEY, which is used for intern key objects in Maria.
Changed functions to take MARIA_KEY as an argument instead of pointer to packed key.
Changed some functions that always return true or false to my_bool.
Added virtual function make_key() to avoid if in _ma_make_key()
Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster
include/my_base.h:
Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check()
Added SEARCH_INSERT to be used when inserting new keys
Added SEARCH_PART_KEY for partial searches
Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID
Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid
include/my_handler.h:
Make next_flag 32 bit to make sure we can handle all SEARCH_ bits
mysql-test/include/maria_empty_logs.inc:
Read and restore current database; Don't assume we are using mysqltest.
Don't log use databasename to log. Using this include should not cause any result changes.
mysql-test/r/maria-gis-rtree-dynamic.result:
Updated results after adding some check table commands to help pinpoint errors
mysql-test/r/maria-mvcc.result:
New tests
mysql-test/r/maria-purge.result:
New result after adding removal of logs
mysql-test/r/maria-recovery-big.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-bitmap.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-rtree-ft.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria.result:
New tests
mysql-test/r/variables-big.result:
Don't log id as it's not predictable
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result:
Updated results to new binlog results. (Test has not been run in a long time as it requires --big)
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt:
Moved file to ndb replication test directory
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test:
Fixed wrong path to included tests
mysql-test/t/maria-gis-rtree-dynamic.test:
Added some check table commands to help pinpoint errors
mysql-test/t/maria-mvcc.test:
New tests
mysql-test/t/maria-purge.test:
Remove logs to make test results predictable
mysql-test/t/maria.test:
New tests for some possible problems
mysql-test/t/variables-big.test:
Don't log id as it's not predictable
mysys/my_handler.c:
Updated function comment to reflect old code
Changed nextflag to be uint32 to ensure we can have flags > 16 bit
Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored.
Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND
Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag
mysys/my_lock.c:
Fixed wrong test (Found by Guilhem)
scripts/Makefile.am:
Ensure that test programs are deleted by make clean
sql/rpl_rli.cc:
Moved assignment order to fix compiler warning
storage/heap/hp_write.c:
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
storage/maria/Makefile.am:
Remove also maria log files when doing make distclean
storage/maria/ha_maria.cc:
Use 'file->start_state' as default state for transactional tables without versioning
At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows)
In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event.
Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave
storage/maria/ma_blockrec.c:
Updated comment
storage/maria/ma_check.c:
Compact key pages (removes transid) when doing --zerofill
Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn()
Removed not needed argument from get_record_for_key()
Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL
Remove some SPATIAL specific code where the virtual functions can handle this in a general manner
Use info->lastkey_buff instead of info->lastkey
_ma_dpos() -> _ma_row_pos_from_key()
_ma_make_key() -> keyinfo->make_key()
_ma_print_key() -> _ma_print_keydata()
_ma_move_key() -> ma_copy_copy()
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Ensure that data on page doesn't overwrite page checksum position
Use DBUG_DUMP_KEY instead of DBUG_DUMP
Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp()
Fixed check if rowid points outside of BLOCK_RECORD data file
Use info->lastkey_buff instead of key on stack in some safe places
Added #fdef EXTERNAL_LOCKING around removed state elements
storage/maria/ma_close.c:
Use keyinfo->root_lock instead of share->key_root_lock[keynr]
storage/maria/ma_create.c:
Removed assert that is already checked in maria_init()
Force transactinal tables to be of type BLOCK_RECORD
Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD)
Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
storage/maria/ma_dbug.c:
Changed _ma_print_key() to use MARIA_KEY
storage/maria/ma_delete.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
info->lastkey2-> info->lastkey_buff2
Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Use new interface for get_key(), _ma_get_last_key() and others
_ma_dpos() -> ma_row_pos_from_key()
Simplify setting of prev_key in del()
Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid
Treath key pages that may have a transid as if keys would be of variable length
storage/maria/ma_delete_all.c:
Reset history state if maria_delete_all_rows() are called
Update parameters to _ma_update_state_lsns() call
storage/maria/ma_extra.c:
Store and restore info->lastkey
storage/maria/ma_ft_boolean_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ft_nlq_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing)
storage/maria/ma_ft_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ftdefs.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_fulltext.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_init.c:
Check if blocksize is legal
(Moved test here from ma_open())
storage/maria/ma_key.c:
Added functions for storing/reading of transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys
Add transid to keys if table is versioned
Added _ma_copy_key()
storage/maria/ma_key_recover.c:
Add logging of page_flag (holds information if there are keys with transid on page)
Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive
Added lots of DBUG_PRINT()
Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE
storage/maria/ma_key_recover.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_locking.c:
Added new arguments to _ma_update_state_lsns_sub()
storage/maria/ma_loghandler.c:
Fixed all logging of LSN to look similar in DBUG log
Changed if (left != 0) to if (left) as the later is used also later in the code
storage/maria/ma_loghandler.h:
Added new index page operations
storage/maria/ma_open.c:
Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned
This is needed to not get double increments of state.records (one in ma_write.c and on when log is written)
Changed info->lastkey to MARIA_KEY type
Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled)
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Check on open that state.create_trid is correct
Extend share->base.max_key_length in case of transactional table so that it can hold transid
Removed 4.0 compatible fulltext key mode as this is not relevant for Maria
Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block
Initialize all new virtual function pointers
Removed storing of state->unique, state->process and store state->create_trid instead
storage/maria/ma_page.c:
Added comment to describe key page structure
Added functions to compact key page and log the compact operation
storage/maria/ma_range.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search
Added handling of pages with transid
storage/maria/ma_recovery.c:
Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rename.c:
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rkey.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Don't use USE_WHOLE_KEY, use real length of key
Use share->row_is_visible() to test if row is visible
Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once
Removed test if last_used_keyseg != 0 as this is always true
storage/maria/ma_rnext.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rnext_same.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
lastkey2 -> lastkey_buff2
storage/maria/ma_rprev.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rsame.c:
Updated comment
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rsamepos.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_index.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use better variable names
Removed not needed casts
_ma_dpos() -> _ma_row_pos_from_key()
Use info->last_rtree_keypos to save position to key instead of info->int_keypos
Simplify err: condition
Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function
storage/maria/ma_rt_index.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_key.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify maria_rtree_add_key by combining idenitcal code and removing added_len
storage/maria/ma_rt_key.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_mbr.c:
Changed type of 'nextflag' to uint32
Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value
storage/maria/ma_rt_mbr.h:
Changed type of 'nextflag' to uint32
storage/maria/ma_rt_split.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
key_length -> key_data_length to catch possible errors
storage/maria/ma_rt_test.c:
Fixed wrong comment
Reset recinfo to avoid valgrind varnings
Fixed wrong argument to create_record() that caused test to fail
storage/maria/ma_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added support of keys with optional trid
Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads
_ma_dpos() -> _ma_row_pos_from_key()
If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search()
Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data)
Combine similar code at end of _ma_get_binary_pack_key()
Removed not used function _ma_move_key()
In _ma_search_next() don't call _ma_search() if we aren't on a nod page.
Update info->cur_row.trid with trid for found key
Removed some not needed casts
Added _ma_trid_from_key()
Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller
storage/maria/ma_sort.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_sp_defs.h:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
storage/maria/ma_sp_key.c:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
Don't test sizeof(double), test against 8 as we are using float8store()
Use mi_float8store() instead of doing swap of value (same thing but faster)
storage/maria/ma_state.c:
maria_versioning() now only calls _ma_block_get_status() if table supports versioning
Added _ma_row_visible_xxx() functions for different occasions
When emptying history, set info->state to point to the first history event.
storage/maria/ma_state.h:
Added _ma_row_visible_xxx() prototypes
storage/maria/ma_static.c:
Indentation changes
storage/maria/ma_statrec.c:
Fixed arguments to _ma_dpointer() and _ma_rec_pos()
storage/maria/ma_test1.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_test2.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_unique.c:
Modified functions to use MARIA_KEY
storage/maria/ma_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_write.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
In _ma_enlarge_root(), mark in page_flag if new key has transid
_ma_dpos() -> _ma_row_pos_from_key()
Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not
Moved 'reversed' to outside block as area was used later
storage/maria/maria_chk.c:
Added error if trying to sort with HA_BINARY_PACK_KEY
Use new interface to get_key() and _ma_dpointer()
_ma_dpos() -> _ma_row_pos_from_key()
storage/maria/maria_def.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning
Added create_trid to MARIA_SHARE
Removed not used state variables 'process' and 'unique'
Added defines for handling TRID's in index pages
Changed to use MARIA_SHARE instead of MARIA_HA for some functions
Added 'have_versioning' flag if table supports versioning
Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF
Changed last_key to be of type MARIA_KEY. Removed lastkey_length
lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2
Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read
Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key
Changed 'nextflag' and assocaited variables to uint32
storage/maria/maria_ftdump.c:
lastkey -> lastkey_buff
storage/maria/trnman.c:
Fixed wrong initialization of min_read_from and max_commit_trid
Added trnman_get_min_safe_trid()
storage/maria/unittest/ma_test_all-t:
Added --start-from
storage/myisam/mi_check.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_delete.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_range.c:
Updated comment
storage/myisam/mi_write.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/rt_index.c:
Fixed wrong parameter to rtree_get_req() which could cause crash
2008-06-26 07:18:28 +02:00
|
|
|
uint16 key_length=info->real_key_length;
|
2006-04-11 15:45:10 +02:00
|
|
|
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 */
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
static int write_index(MARIA_SORT_PARAM *info, register uchar **sort_keys,
|
|
|
|
register ha_keys count)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
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 */
|
|
|
|
}
|
2011-07-01 14:08:30 +02:00
|
|
|
if (info->sort_info->param->max_stage != 1) /* If not parallel */
|
|
|
|
_ma_report_progress(info->sort_info->param, 1, 1);
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
} /* write_index */
|
|
|
|
|
|
|
|
|
|
|
|
/* Merge buffers to make < MERGEBUFF2 buffers */
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
static int merge_many_buff(MARIA_SORT_PARAM *info, ha_keys keys,
|
|
|
|
uchar **sort_keys, BUFFPEK *buffpek,
|
|
|
|
uint *maxbuffer, IO_CACHE *t_file)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
uint tmp, merges, max_merges;
|
2006-04-11 15:45:10 +02:00
|
|
|
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 */
|
|
|
|
|
2011-07-01 14:08:30 +02:00
|
|
|
/* Calculate how many merges are needed */
|
|
|
|
max_merges= 1; /* Count merge_index */
|
|
|
|
tmp= *maxbuffer;
|
|
|
|
while (tmp >= MERGEBUFF2)
|
|
|
|
{
|
|
|
|
merges= (tmp-MERGEBUFF*3/2 + 1) / MERGEBUFF + 1;
|
|
|
|
max_merges+= merges;
|
|
|
|
tmp= merges;
|
|
|
|
}
|
|
|
|
merges= 0;
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
from_file= t_file ; to_file= &t_file2;
|
|
|
|
while (*maxbuffer >= MERGEBUFF2)
|
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
uint i;
|
2006-04-11 15:45:10 +02:00
|
|
|
reinit_io_cache(from_file,READ_CACHE,0L,0,0);
|
|
|
|
reinit_io_cache(to_file,WRITE_CACHE,0L,0,0);
|
|
|
|
lastbuff=buffpek;
|
2013-05-10 11:32:34 +02:00
|
|
|
for (i=0 ; i + MERGEBUFF*3/2 <= *maxbuffer ; i+=MERGEBUFF)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
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;
|
2011-07-01 14:08:30 +02:00
|
|
|
if (info->sort_info->param->max_stage != 1) /* If not parallel */
|
|
|
|
_ma_report_progress(info->sort_info->param, merges++, max_merges);
|
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;
|
2013-05-10 11:32:34 +02:00
|
|
|
*maxbuffer= (uint) (lastbuff-buffpek)-1;
|
2011-07-01 14:08:30 +02:00
|
|
|
if (info->sort_info->param->max_stage != 1) /* If not parallel */
|
|
|
|
_ma_report_progress(info->sort_info->param, merges++, max_merges);
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
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)
|
2013-05-10 11:32:34 +02:00
|
|
|
{
|
|
|
|
DBUG_ASSERT(t_file2.type == WRITE_CACHE);
|
2006-04-11 15:45:10 +02:00
|
|
|
*t_file=t_file2; /* Copy result file */
|
2013-05-10 11:32:34 +02:00
|
|
|
}
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
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
|
|
|
|
*/
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
static my_off_t read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
|
|
|
|
uint sort_length)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
register ha_keys count;
|
2017-09-28 12:38:02 +02:00
|
|
|
size_t length;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2016-06-24 01:25:14 +02:00
|
|
|
if ((count= (ha_keys) MY_MIN((ha_rows) buffpek->max_keys,
|
|
|
|
(ha_rows) buffpek->count)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2015-05-26 22:09:40 +02:00
|
|
|
if (my_b_pread(fromfile, (uchar*) buffpek->base,
|
2017-09-28 12:38:02 +02:00
|
|
|
(length= sort_length * (size_t)count), buffpek->file_pos))
|
2013-05-10 11:32:34 +02:00
|
|
|
return(HA_OFFSET_ERROR); /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
buffpek->key=buffpek->base;
|
|
|
|
buffpek->file_pos+= length; /* New filepos */
|
|
|
|
buffpek->count-= count;
|
|
|
|
buffpek->mem_count= count;
|
|
|
|
}
|
2013-05-10 11:32:34 +02:00
|
|
|
return (((my_off_t) count) * sort_length);
|
2006-04-11 15:45:10 +02:00
|
|
|
} /* read_to_buffer */
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
|
|
|
|
static my_off_t read_to_buffer_varlen(IO_CACHE *fromfile, BUFFPEK *buffpek,
|
|
|
|
uint sort_length)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
register ha_keys count;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint idx;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *buffp;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2013-07-21 16:39:19 +02:00
|
|
|
if ((count= (ha_keys) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
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++)
|
|
|
|
{
|
Added versioning of Maria index
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey
Renamed old info->lastkey to info->lastkey_buff
Use exact key lenghts for keys, not USE_WHOLE_KEY
For partial key searches, use SEARCH_PART_KEY
When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid
Changes done in a lot of files:
- Modified functions to use MARIA_KEY instead of key pointer and key length
- Use keyinfo->root_lock instead of share->key_root_lock[keynr]
- Simplify code by using local variable keyinfo instead if share->keyinfo[i]
- Added #fdef EXTERNAL_LOCKING around removed state elements
- HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid)
- Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it
.bzrignore:
Added missing temporary directory
extra/Makefile.am:
comp_err is now deleted on make distclean
include/maria.h:
Added structure MARIA_KEY, which is used for intern key objects in Maria.
Changed functions to take MARIA_KEY as an argument instead of pointer to packed key.
Changed some functions that always return true or false to my_bool.
Added virtual function make_key() to avoid if in _ma_make_key()
Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster
include/my_base.h:
Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check()
Added SEARCH_INSERT to be used when inserting new keys
Added SEARCH_PART_KEY for partial searches
Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID
Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid
include/my_handler.h:
Make next_flag 32 bit to make sure we can handle all SEARCH_ bits
mysql-test/include/maria_empty_logs.inc:
Read and restore current database; Don't assume we are using mysqltest.
Don't log use databasename to log. Using this include should not cause any result changes.
mysql-test/r/maria-gis-rtree-dynamic.result:
Updated results after adding some check table commands to help pinpoint errors
mysql-test/r/maria-mvcc.result:
New tests
mysql-test/r/maria-purge.result:
New result after adding removal of logs
mysql-test/r/maria-recovery-big.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-bitmap.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery-rtree-ft.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria-recovery.result:
maria_empty_logs doesn't log 'use mysqltest' anymore
mysql-test/r/maria.result:
New tests
mysql-test/r/variables-big.result:
Don't log id as it's not predictable
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result:
Updated results to new binlog results. (Test has not been run in a long time as it requires --big)
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt:
Moved file to ndb replication test directory
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test:
Fixed wrong path to included tests
mysql-test/t/maria-gis-rtree-dynamic.test:
Added some check table commands to help pinpoint errors
mysql-test/t/maria-mvcc.test:
New tests
mysql-test/t/maria-purge.test:
Remove logs to make test results predictable
mysql-test/t/maria.test:
New tests for some possible problems
mysql-test/t/variables-big.test:
Don't log id as it's not predictable
mysys/my_handler.c:
Updated function comment to reflect old code
Changed nextflag to be uint32 to ensure we can have flags > 16 bit
Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored.
Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND
Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag
mysys/my_lock.c:
Fixed wrong test (Found by Guilhem)
scripts/Makefile.am:
Ensure that test programs are deleted by make clean
sql/rpl_rli.cc:
Moved assignment order to fix compiler warning
storage/heap/hp_write.c:
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
storage/maria/Makefile.am:
Remove also maria log files when doing make distclean
storage/maria/ha_maria.cc:
Use 'file->start_state' as default state for transactional tables without versioning
At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows)
In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event.
Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave
storage/maria/ma_blockrec.c:
Updated comment
storage/maria/ma_check.c:
Compact key pages (removes transid) when doing --zerofill
Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn()
Removed not needed argument from get_record_for_key()
Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL
Remove some SPATIAL specific code where the virtual functions can handle this in a general manner
Use info->lastkey_buff instead of info->lastkey
_ma_dpos() -> _ma_row_pos_from_key()
_ma_make_key() -> keyinfo->make_key()
_ma_print_key() -> _ma_print_keydata()
_ma_move_key() -> ma_copy_copy()
Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Ensure that data on page doesn't overwrite page checksum position
Use DBUG_DUMP_KEY instead of DBUG_DUMP
Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp()
Fixed check if rowid points outside of BLOCK_RECORD data file
Use info->lastkey_buff instead of key on stack in some safe places
Added #fdef EXTERNAL_LOCKING around removed state elements
storage/maria/ma_close.c:
Use keyinfo->root_lock instead of share->key_root_lock[keynr]
storage/maria/ma_create.c:
Removed assert that is already checked in maria_init()
Force transactinal tables to be of type BLOCK_RECORD
Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD)
Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
storage/maria/ma_dbug.c:
Changed _ma_print_key() to use MARIA_KEY
storage/maria/ma_delete.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
info->lastkey2-> info->lastkey_buff2
Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
Use new interface for get_key(), _ma_get_last_key() and others
_ma_dpos() -> ma_row_pos_from_key()
Simplify setting of prev_key in del()
Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid
Treath key pages that may have a transid as if keys would be of variable length
storage/maria/ma_delete_all.c:
Reset history state if maria_delete_all_rows() are called
Update parameters to _ma_update_state_lsns() call
storage/maria/ma_extra.c:
Store and restore info->lastkey
storage/maria/ma_ft_boolean_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ft_nlq_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing)
storage/maria/ma_ft_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_ftdefs.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_fulltext.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_init.c:
Check if blocksize is legal
(Moved test here from ma_open())
storage/maria/ma_key.c:
Added functions for storing/reading of transid
Modified functions to use MARIA_KEY instead of key pointer and key length
Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys
Add transid to keys if table is versioned
Added _ma_copy_key()
storage/maria/ma_key_recover.c:
Add logging of page_flag (holds information if there are keys with transid on page)
Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive
Added lots of DBUG_PRINT()
Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE
storage/maria/ma_key_recover.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_locking.c:
Added new arguments to _ma_update_state_lsns_sub()
storage/maria/ma_loghandler.c:
Fixed all logging of LSN to look similar in DBUG log
Changed if (left != 0) to if (left) as the later is used also later in the code
storage/maria/ma_loghandler.h:
Added new index page operations
storage/maria/ma_open.c:
Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned
This is needed to not get double increments of state.records (one in ma_write.c and on when log is written)
Changed info->lastkey to MARIA_KEY type
Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled)
Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
Check on open that state.create_trid is correct
Extend share->base.max_key_length in case of transactional table so that it can hold transid
Removed 4.0 compatible fulltext key mode as this is not relevant for Maria
Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block
Initialize all new virtual function pointers
Removed storing of state->unique, state->process and store state->create_trid instead
storage/maria/ma_page.c:
Added comment to describe key page structure
Added functions to compact key page and log the compact operation
storage/maria/ma_range.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search
Added handling of pages with transid
storage/maria/ma_recovery.c:
Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rename.c:
Added new arguments to _ma_update_state_lsns()
storage/maria/ma_rkey.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Don't use USE_WHOLE_KEY, use real length of key
Use share->row_is_visible() to test if row is visible
Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once
Removed test if last_used_keyseg != 0 as this is always true
storage/maria/ma_rnext.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rnext_same.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
lastkey2 -> lastkey_buff2
storage/maria/ma_rprev.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Use share->row_is_visible() to test if row is visible
storage/maria/ma_rsame.c:
Updated comment
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rsamepos.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_index.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Use better variable names
Removed not needed casts
_ma_dpos() -> _ma_row_pos_from_key()
Use info->last_rtree_keypos to save position to key instead of info->int_keypos
Simplify err: condition
Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function
storage/maria/ma_rt_index.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_key.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify maria_rtree_add_key by combining idenitcal code and removing added_len
storage/maria/ma_rt_key.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_rt_mbr.c:
Changed type of 'nextflag' to uint32
Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value
storage/maria/ma_rt_mbr.h:
Changed type of 'nextflag' to uint32
storage/maria/ma_rt_split.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
key_length -> key_data_length to catch possible errors
storage/maria/ma_rt_test.c:
Fixed wrong comment
Reset recinfo to avoid valgrind varnings
Fixed wrong argument to create_record() that caused test to fail
storage/maria/ma_search.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added support of keys with optional trid
Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads
_ma_dpos() -> _ma_row_pos_from_key()
If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search()
Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data)
Combine similar code at end of _ma_get_binary_pack_key()
Removed not used function _ma_move_key()
In _ma_search_next() don't call _ma_search() if we aren't on a nod page.
Update info->cur_row.trid with trid for found key
Removed some not needed casts
Added _ma_trid_from_key()
Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller
storage/maria/ma_sort.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_sp_defs.h:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
storage/maria/ma_sp_key.c:
_ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
Don't test sizeof(double), test against 8 as we are using float8store()
Use mi_float8store() instead of doing swap of value (same thing but faster)
storage/maria/ma_state.c:
maria_versioning() now only calls _ma_block_get_status() if table supports versioning
Added _ma_row_visible_xxx() functions for different occasions
When emptying history, set info->state to point to the first history event.
storage/maria/ma_state.h:
Added _ma_row_visible_xxx() prototypes
storage/maria/ma_static.c:
Indentation changes
storage/maria/ma_statrec.c:
Fixed arguments to _ma_dpointer() and _ma_rec_pos()
storage/maria/ma_test1.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_test2.c:
Call init_thr_lock() if we have versioning
storage/maria/ma_unique.c:
Modified functions to use MARIA_KEY
storage/maria/ma_update.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
storage/maria/ma_write.c:
Modified functions to use MARIA_KEY instead of key pointer and key length
Simplify code by using local variable keyinfo instead if share->keyinfo[i]
In _ma_enlarge_root(), mark in page_flag if new key has transid
_ma_dpos() -> _ma_row_pos_from_key()
Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not
Moved 'reversed' to outside block as area was used later
storage/maria/maria_chk.c:
Added error if trying to sort with HA_BINARY_PACK_KEY
Use new interface to get_key() and _ma_dpointer()
_ma_dpos() -> _ma_row_pos_from_key()
storage/maria/maria_def.h:
Modified functions to use MARIA_KEY instead of key pointer and key length
Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning
Added create_trid to MARIA_SHARE
Removed not used state variables 'process' and 'unique'
Added defines for handling TRID's in index pages
Changed to use MARIA_SHARE instead of MARIA_HA for some functions
Added 'have_versioning' flag if table supports versioning
Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF
Changed last_key to be of type MARIA_KEY. Removed lastkey_length
lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2
Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read
Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key
Changed 'nextflag' and assocaited variables to uint32
storage/maria/maria_ftdump.c:
lastkey -> lastkey_buff
storage/maria/trnman.c:
Fixed wrong initialization of min_read_from and max_commit_trid
Added trnman_get_min_safe_trid()
storage/maria/unittest/ma_test_all-t:
Added --start-from
storage/myisam/mi_check.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_delete.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/mi_range.c:
Updated comment
storage/myisam/mi_write.c:
Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
storage/myisam/rt_index.c:
Fixed wrong parameter to rtree_get_req() which could cause crash
2008-06-26 07:18:28 +02:00
|
|
|
uint16 length_of_key;
|
2015-05-26 22:09:40 +02:00
|
|
|
if (my_b_pread(fromfile, (uchar*)&length_of_key,
|
|
|
|
sizeof(length_of_key), buffpek->file_pos))
|
2013-05-10 11:32:34 +02:00
|
|
|
return(HA_OFFSET_ERROR);
|
2006-04-11 15:45:10 +02:00
|
|
|
buffpek->file_pos+=sizeof(length_of_key);
|
2015-05-26 22:09:40 +02:00
|
|
|
if (my_b_pread(fromfile, (uchar*) buffp,
|
|
|
|
length_of_key, buffpek->file_pos))
|
2006-04-11 15:45:10 +02:00
|
|
|
return((uint) -1);
|
|
|
|
buffpek->file_pos+=length_of_key;
|
|
|
|
buffp = buffp + sort_length;
|
|
|
|
}
|
|
|
|
buffpek->key=buffpek->base;
|
|
|
|
buffpek->count-= count;
|
|
|
|
buffpek->mem_count= count;
|
|
|
|
}
|
2013-05-10 11:32:34 +02:00
|
|
|
return (((my_off_t) count) * sort_length);
|
2006-04-11 15:45:10 +02:00
|
|
|
} /* 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,
|
2013-05-10 11:32:34 +02:00
|
|
|
uint sort_length, ha_keys count)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
ha_keys 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)),
|
2013-05-10 11:32:34 +02:00
|
|
|
IO_CACHE *to_file, uchar *key,
|
|
|
|
uint sort_length, ha_keys count)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2016-06-24 01:25:14 +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
|
2013-05-10 11:32:34 +02:00
|
|
|
|
|
|
|
Return:
|
|
|
|
0 ok
|
|
|
|
1 error
|
2006-04-11 15:45:10 +02:00
|
|
|
*/
|
|
|
|
|
2011-04-25 17:22:25 +02:00
|
|
|
static int
|
2013-05-10 11:32:34 +02:00
|
|
|
merge_buffers(MARIA_SORT_PARAM *info, ha_keys 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)
|
|
|
|
{
|
2013-05-10 11:32:34 +02:00
|
|
|
int error= 1;
|
|
|
|
uint sort_length;
|
|
|
|
ha_keys maxcount;
|
2006-04-11 15:45:10 +02:00
|
|
|
ha_rows count;
|
2013-05-10 11:32:34 +02:00
|
|
|
my_off_t UNINIT_VAR(to_start_filepos), read_length;
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *strpos;
|
2006-04-11 15:45:10 +02:00
|
|
|
BUFFPEK *buffpek,**refpek;
|
|
|
|
QUEUE queue;
|
|
|
|
DBUG_ENTER("merge_buffers");
|
|
|
|
|
2013-05-10 11:32:34 +02:00
|
|
|
count= 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
|
|
|
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,
|
2010-07-16 09:33:01 +02:00
|
|
|
(void*) info, 0, 0))
|
2006-04-11 15:45:10 +02:00
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
|
|
|
|
|
|
for (buffpek= Fb ; buffpek <= Tb ; buffpek++)
|
|
|
|
{
|
|
|
|
count+= buffpek->count;
|
|
|
|
buffpek->base= strpos;
|
2013-05-10 11:32:34 +02:00
|
|
|
buffpek->max_keys= maxcount;
|
|
|
|
strpos+= (read_length= info->read_to_buffer(from_file,buffpek,
|
|
|
|
sort_length));
|
|
|
|
if (read_length == HA_OFFSET_ERROR)
|
2006-04-11 15:45:10 +02:00
|
|
|
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 (;;)
|
|
|
|
{
|
|
|
|
buffpek=(BUFFPEK*) queue_top(&queue);
|
|
|
|
if (to_file)
|
|
|
|
{
|
2009-01-09 05:23:25 +01:00
|
|
|
if (info->write_key(info,to_file, buffpek->key,
|
2016-06-24 01:25:14 +02:00
|
|
|
sort_length, 1))
|
2013-05-10 11:32:34 +02:00
|
|
|
goto err; /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ((*info->key_write)(info,(void*) buffpek->key))
|
2013-05-10 11:32:34 +02:00
|
|
|
goto err; /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
buffpek->key+=sort_length;
|
|
|
|
if (! --buffpek->mem_count)
|
|
|
|
{
|
2009-11-30 00:08:56 +01:00
|
|
|
/* It's enough to check for killedptr before a slow operation */
|
|
|
|
if (_ma_killed_ptr(info->sort_info->param))
|
|
|
|
goto err;
|
2013-05-10 11:32:34 +02:00
|
|
|
if (!(read_length= info->read_to_buffer(from_file,buffpek,sort_length)))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
2007-07-02 19:45:15 +02:00
|
|
|
uchar *base= buffpek->base;
|
2016-06-24 01:25:14 +02:00
|
|
|
ha_keys max_keys=buffpek->max_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
2011-04-25 17:22:25 +02:00
|
|
|
queue_remove_top(&queue);
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
/* 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 */
|
|
|
|
}
|
2013-05-10 11:32:34 +02:00
|
|
|
else if (read_length == HA_OFFSET_ERROR)
|
|
|
|
goto err; /* purecov: inspected */
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
2010-07-16 09:33:01 +02:00
|
|
|
queue_replace_top(&queue); /* Top element has been replaced */
|
2006-04-11 15:45:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
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)
|
|
|
|
{
|
2009-01-09 05:23:25 +01:00
|
|
|
if (info->write_key(info, to_file, 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)
|
|
|
|
{
|
2009-01-09 05:23:25 +01:00
|
|
|
if ((*info->key_write)(info, strpos))
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
error=1; goto err; /* purecov: inspected */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-05-10 11:32:34 +02:00
|
|
|
while ((read_length= info->read_to_buffer(from_file,buffpek,sort_length)) != HA_OFFSET_ERROR && read_length != 0);
|
|
|
|
if (read_length == 0)
|
|
|
|
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) */
|
|
|
|
|
2011-04-25 17:22:25 +02:00
|
|
|
static int
|
2013-05-10 11:32:34 +02:00
|
|
|
merge_index(MARIA_SORT_PARAM *info, ha_keys keys, uchar **sort_keys,
|
|
|
|
BUFFPEK *buffpek, uint maxbuffer, IO_CACHE *tempfile)
|
2006-04-11 15:45:10 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("merge_index");
|
|
|
|
if (merge_buffers(info,keys,tempfile,(IO_CACHE*) 0,sort_keys,buffpek,buffpek,
|
|
|
|
buffpek+maxbuffer))
|
|
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
2011-07-01 14:08:30 +02:00
|
|
|
if (info->sort_info->param->max_stage != 1) /* If not parallel */
|
|
|
|
_ma_report_progress(info->sort_info->param, 1, 1);
|
2006-04-11 15:45:10 +02:00
|
|
|
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);
|
2011-04-25 17:22:25 +02:00
|
|
|
my_free(info->sort_info->ft_buf);
|
2006-04-11 15:45:10 +02:00
|
|
|
info->sort_info->ft_buf=0;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|