mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
2f6f08ed88
Changed info->s -> share to get more efficent code Updated arguments to page accessor functions to use MARIA_SHARE * instead of MARIA_HA *. Tested running tests in quick mode (no balance page on insert and only when critical on delete) Fixed bug in underflow handling in quick mode Fixed bug in log handler where it accessed not initialized variable Fixed bug in log handler where it didn't free mutex in unlikely error condition Removed double write of page in case of of some underflow conditions Added DBUG_PRINT in safemutex lock/unlock dbug/dbug.c: Compile without SAFE_MUTEX (to be able to use DBUG_PRINT in safe_mutex code) Use calls to get/set my_thread_var->dbug. (Make dbug independent of compile time options for mysys) include/my_pthread.h: Added prototypes for my_thread_var_get_dbug() & my_thread_var_set_dbug() mysql-test/lib/mtr_report.pl: Don't check warnings in log files if we are using --extern mysys/my_thr_init.c: Added my_thread_var_get_dbug() & my_thread_var_set_dbug() mysys/thr_mutex.c: Added DBUG printing of addresses to mutex for lock/unlock storage/maria/ma_blockrec.c: Fixed comment storage/maria/ma_check.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_close.c: Indentation fixes storage/maria/ma_create.c: Calculate min_key_length correctly storage/maria/ma_dbug.c: Indentation fixes storage/maria/ma_delete.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions Removed some writing of key pages that underflow (will be written by caller) Fixed crashing bug in underflow handling when using quick mode storage/maria/ma_delete_all.c: Indentation fixes storage/maria/ma_dynrec.c: Indentation fixes storage/maria/ma_extra.c: Fixed indentation Removed old useless code Reset share->changed if we have written state storage/maria/ma_ft_update.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_info.c: Indentation fixes storage/maria/ma_key_recover.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_locking.c: Indentation fixes storage/maria/ma_loghandler.c: Removed wrapper functions translog_mutex_lock and translog_mutex_unlock (safemutex now does same kind of printing) Renamed LOGREC_REDO_INSERT_ROW_BLOB to LOGREC_REDO_INSERT_NOT_USED to mark it free Fixed some DBUG_PRINT to ensure that convert-dbug-for-diff works Fixed bug in translog_flush() that caused log to stop syncing to disk Added missing mutex_unlock in case of error storage/maria/ma_loghandler.h: Renamed LOGREC_REDO_INSERT_ROW_BLOB to LOGREC_REDO_INSERT_NOT_USED to mark it free storage/maria/ma_open.c: Indentation fixes storage/maria/ma_packrec.c: Indentation fixes storage/maria/ma_page.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions Added check that we never write a key page without content (except in recovery where a key page may temporary be without content) storage/maria/ma_preload.c: Updated arguments to page accessor functions storage/maria/ma_range.c: Updated arguments to page accessor functions storage/maria/ma_rkey.c: Indentation fixes storage/maria/ma_rprev.c: Indentation fixes storage/maria/ma_rt_index.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_rt_index.h: Updated arguments to page accessor functions storage/maria/ma_rt_key.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_rt_mbr.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_rt_split.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_search.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_sort.c: Indentation fixes storage/maria/ma_statrec.c: Indentation fixes storage/maria/ma_test1.c: Added extra undo test Flush also keys in -u1, to ensure that the full log is flushed storage/maria/ma_test2.c: Added extra undo test Flush also keys in -u1, to ensure that the full log is flushed storage/maria/ma_test_recovery.expected: Updated results storage/maria/ma_test_recovery: Added extra undo test storage/maria/ma_update.c: Indentation fixes storage/maria/ma_write.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions Prepare for quick mode for insert (don't balance page) storage/maria/maria_chk.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/maria_def.h: Updated arguments to page accessor functions
297 lines
9.9 KiB
C
297 lines
9.9 KiB
C
/* 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
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Gives a approximated number of how many records there is between two keys.
|
|
Used when optimizing querries.
|
|
*/
|
|
|
|
#include "maria_def.h"
|
|
#include "ma_rt_index.h"
|
|
|
|
static ha_rows _ma_record_pos(MARIA_HA *,const uchar *, key_part_map,
|
|
enum ha_rkey_function);
|
|
static double _ma_search_pos(MARIA_HA *, MARIA_KEYDEF *, uchar *,
|
|
uint, uint, my_off_t);
|
|
static uint _ma_keynr(MARIA_HA *, MARIA_KEYDEF *, uchar *, uchar *, uint *);
|
|
|
|
|
|
/**
|
|
@brief Estimate how many records there is in a given range
|
|
|
|
@param info MARIA handler
|
|
@param inx Index to use
|
|
@param min_key Min key. Is = 0 if no min range
|
|
@param max_key Max key. Is = 0 if no max range
|
|
|
|
@note
|
|
We should ONLY return 0 if there is no rows in range
|
|
|
|
@return Estimated number of rows or error
|
|
@retval HA_POS_ERROR error (or we can't estimate number of rows)
|
|
@retval number Estimated number of rows
|
|
*/
|
|
|
|
ha_rows maria_records_in_range(MARIA_HA *info, int inx, key_range *min_key,
|
|
key_range *max_key)
|
|
{
|
|
ha_rows start_pos,end_pos,res;
|
|
DBUG_ENTER("maria_records_in_range");
|
|
|
|
if ((inx = _ma_check_index(info,inx)) < 0)
|
|
DBUG_RETURN(HA_POS_ERROR);
|
|
|
|
if (fast_ma_readinfo(info))
|
|
DBUG_RETURN(HA_POS_ERROR);
|
|
info->update&= (HA_STATE_CHANGED+HA_STATE_ROW_CHANGED);
|
|
if (info->s->concurrent_insert)
|
|
rw_rdlock(&info->s->key_root_lock[inx]);
|
|
|
|
switch(info->s->keyinfo[inx].key_alg){
|
|
#ifdef HAVE_RTREE_KEYS
|
|
case HA_KEY_ALG_RTREE:
|
|
{
|
|
uchar *key_buff;
|
|
uint start_key_len;
|
|
|
|
/*
|
|
The problem is that the optimizer doesn't support
|
|
RTree keys properly at the moment.
|
|
Hope this will be fixed some day.
|
|
But now NULL in the min_key means that we
|
|
didn't make the task for the RTree key
|
|
and expect BTree functionality from it.
|
|
As it's not able to handle such request
|
|
we return the error.
|
|
*/
|
|
if (!min_key)
|
|
{
|
|
res= HA_POS_ERROR;
|
|
break;
|
|
}
|
|
key_buff= info->lastkey+info->s->base.max_key_length;
|
|
start_key_len= _ma_pack_key(info,inx, key_buff,
|
|
min_key->key, min_key->keypart_map,
|
|
(HA_KEYSEG**) 0);
|
|
res= maria_rtree_estimate(info, inx, key_buff, start_key_len,
|
|
maria_read_vec[min_key->flag]);
|
|
res= res ? res : 1; /* Don't return 0 */
|
|
break;
|
|
}
|
|
#endif
|
|
case HA_KEY_ALG_BTREE:
|
|
default:
|
|
start_pos= (min_key ?
|
|
_ma_record_pos(info, min_key->key, min_key->keypart_map,
|
|
min_key->flag) :
|
|
(ha_rows) 0);
|
|
end_pos= (max_key ?
|
|
_ma_record_pos(info, max_key->key, max_key->keypart_map,
|
|
max_key->flag) :
|
|
info->state->records + (ha_rows) 1);
|
|
res= (end_pos < start_pos ? (ha_rows) 0 :
|
|
(end_pos == start_pos ? (ha_rows) 1 : end_pos-start_pos));
|
|
if (start_pos == HA_POS_ERROR || end_pos == HA_POS_ERROR)
|
|
res=HA_POS_ERROR;
|
|
}
|
|
|
|
if (info->s->concurrent_insert)
|
|
rw_unlock(&info->s->key_root_lock[inx]);
|
|
fast_ma_writeinfo(info);
|
|
|
|
/**
|
|
@todo LOCK
|
|
If res==0 (no rows), if we need to guarantee repeatability of the search,
|
|
we will need to set a next-key lock in this statement.
|
|
Also SELECT COUNT(*)...
|
|
*/
|
|
|
|
DBUG_PRINT("info",("records: %ld",(ulong) (res)));
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
|
|
/* Find relative position (in records) for key in index-tree */
|
|
|
|
static ha_rows _ma_record_pos(MARIA_HA *info, const uchar *key,
|
|
key_part_map keypart_map,
|
|
enum ha_rkey_function search_flag)
|
|
{
|
|
uint inx=(uint) info->lastinx, nextflag, key_len;
|
|
MARIA_KEYDEF *keyinfo=info->s->keyinfo+inx;
|
|
uchar *key_buff;
|
|
double pos;
|
|
DBUG_ENTER("_ma_record_pos");
|
|
DBUG_PRINT("enter",("search_flag: %d",search_flag));
|
|
DBUG_ASSERT(keypart_map);
|
|
|
|
key_buff=info->lastkey+info->s->base.max_key_length;
|
|
key_len= _ma_pack_key(info, inx, key_buff, key, keypart_map,
|
|
(HA_KEYSEG**) 0);
|
|
DBUG_EXECUTE("key", _ma_print_key(DBUG_FILE, keyinfo->seg,
|
|
key_buff, key_len););
|
|
nextflag=maria_read_vec[search_flag];
|
|
if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST)))
|
|
key_len=USE_WHOLE_KEY;
|
|
|
|
/*
|
|
my_handler.c:mi_compare_text() has a flag 'skip_end_space'.
|
|
This is set in my_handler.c:ha_key_cmp() in dependence on the
|
|
compare flags 'nextflag' and the column type.
|
|
|
|
TEXT columns are of type HA_KEYTYPE_VARTEXT. In this case the
|
|
condition is skip_end_space= ((nextflag & (SEARCH_FIND |
|
|
SEARCH_UPDATE)) == SEARCH_FIND).
|
|
|
|
SEARCH_FIND is used for an exact key search. The combination
|
|
SEARCH_FIND | SEARCH_UPDATE is used in write/update/delete
|
|
operations with a comment like "Not real duplicates", whatever this
|
|
means. From the condition above we can see that 'skip_end_space' is
|
|
always false for these operations. The result is that trailing space
|
|
counts in key comparison and hence, emtpy strings ('', string length
|
|
zero, but not NULL) compare less that strings starting with control
|
|
characters and these in turn compare less than strings starting with
|
|
blanks.
|
|
|
|
When estimating the number of records in a key range, we request an
|
|
exact search for the minimum key. This translates into a plain
|
|
SEARCH_FIND flag. Using this alone would lead to a 'skip_end_space'
|
|
compare. Empty strings would be expected above control characters.
|
|
Their keys would not be found because they are located below control
|
|
characters.
|
|
|
|
This is the reason that we add the SEARCH_UPDATE flag here. It makes
|
|
the key estimation compare in the same way like key write operations
|
|
do. Olny so we will find the keys where they have been inserted.
|
|
|
|
Adding the flag unconditionally does not hurt as it is used in the
|
|
above mentioned condition only. So it can safely be used together
|
|
with other flags.
|
|
*/
|
|
pos= _ma_search_pos(info,keyinfo, key_buff, key_len,
|
|
nextflag | SEARCH_SAVE_BUFF | SEARCH_UPDATE,
|
|
info->s->state.key_root[inx]);
|
|
if (pos >= 0.0)
|
|
{
|
|
DBUG_PRINT("exit",("pos: %ld",(ulong) (pos*info->state->records)));
|
|
DBUG_RETURN((ulong) (pos*info->state->records+0.5));
|
|
}
|
|
DBUG_RETURN(HA_POS_ERROR);
|
|
}
|
|
|
|
|
|
/* This is a modified version of _ma_search */
|
|
/* Returns offset for key in indextable (decimal 0.0 <= x <= 1.0) */
|
|
|
|
static double _ma_search_pos(register MARIA_HA *info,
|
|
register MARIA_KEYDEF *keyinfo,
|
|
uchar *key, uint key_len, uint nextflag,
|
|
register my_off_t pos)
|
|
{
|
|
int flag;
|
|
uint nod_flag,keynr,max_keynr;
|
|
my_bool after_key;
|
|
uchar *keypos, *buff;
|
|
double offset;
|
|
DBUG_ENTER("_ma_search_pos");
|
|
LINT_INIT(max_keynr);
|
|
|
|
if (pos == HA_OFFSET_ERROR)
|
|
DBUG_RETURN(0.5);
|
|
|
|
if (!(buff= _ma_fetch_keypage(info,keyinfo, pos,
|
|
PAGECACHE_LOCK_LEFT_UNLOCKED, DFLT_INIT_HITS,
|
|
info->buff, 1, 0)))
|
|
goto err;
|
|
flag=(*keyinfo->bin_search)(info, keyinfo, buff, key, key_len, nextflag,
|
|
&keypos,info->lastkey, &after_key);
|
|
nod_flag=_ma_test_if_nod(info->s, buff);
|
|
keynr= _ma_keynr(info,keyinfo,buff,keypos,&max_keynr);
|
|
|
|
if (flag)
|
|
{
|
|
if (flag == MARIA_FOUND_WRONG_KEY)
|
|
DBUG_RETURN(-1); /* error */
|
|
/*
|
|
Didn't found match. keypos points at next (bigger) key
|
|
Try to find a smaller, better matching key.
|
|
Matches keynr + [0-1]
|
|
*/
|
|
if (flag > 0 && ! nod_flag)
|
|
offset= 1.0;
|
|
else if ((offset= _ma_search_pos(info,keyinfo,key,key_len,nextflag,
|
|
_ma_kpos(nod_flag,keypos))) < 0)
|
|
DBUG_RETURN(offset);
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
Found match. Keypos points at the start of the found key
|
|
Matches keynr+1
|
|
*/
|
|
offset=1.0; /* Matches keynr+1 */
|
|
if ((nextflag & SEARCH_FIND) && nod_flag &&
|
|
((keyinfo->flag & (HA_NOSAME | HA_NULL_PART)) != HA_NOSAME ||
|
|
key_len != USE_WHOLE_KEY))
|
|
{
|
|
/*
|
|
There may be identical keys in the tree. Try to match on of those.
|
|
Matches keynr + [0-1]
|
|
*/
|
|
if ((offset= _ma_search_pos(info,keyinfo,key,key_len,SEARCH_FIND,
|
|
_ma_kpos(nod_flag,keypos))) < 0)
|
|
DBUG_RETURN(offset); /* Read error */
|
|
}
|
|
}
|
|
DBUG_PRINT("info",("keynr: %d offset: %g max_keynr: %d nod: %d flag: %d",
|
|
keynr,offset,max_keynr,nod_flag,flag));
|
|
DBUG_RETURN((keynr+offset)/(max_keynr+1));
|
|
err:
|
|
DBUG_PRINT("exit",("Error: %d",my_errno));
|
|
DBUG_RETURN (-1.0);
|
|
}
|
|
|
|
|
|
/* Get keynummer of current key and max number of keys in nod */
|
|
|
|
static uint _ma_keynr(MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
|
|
uchar *page, uchar *keypos, uint *ret_max_key)
|
|
{
|
|
uint nod_flag, used_length, keynr, max_key;
|
|
uchar t_buff[HA_MAX_KEY_BUFF],*end;
|
|
|
|
_ma_get_used_and_nod(info->s, page, used_length, nod_flag);
|
|
end= page+ used_length;
|
|
page+= info->s->keypage_header + nod_flag;
|
|
|
|
if (!(keyinfo->flag & (HA_VAR_LENGTH_KEY | HA_BINARY_PACK_KEY)))
|
|
{
|
|
*ret_max_key= (uint) (end-page)/(keyinfo->keylength+nod_flag);
|
|
return (uint) (keypos-page)/(keyinfo->keylength+nod_flag);
|
|
}
|
|
|
|
max_key=keynr=0;
|
|
t_buff[0]=0; /* Safety */
|
|
while (page < end)
|
|
{
|
|
if (!(*keyinfo->get_key)(keyinfo,nod_flag,&page,t_buff))
|
|
return 0; /* Error */
|
|
max_key++;
|
|
if (page == keypos)
|
|
keynr=max_key;
|
|
}
|
|
*ret_max_key=max_key;
|
|
return(keynr);
|
|
}
|