mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
eb7d9500a9
Short overview: Changed a lot of variable, functions, defines and struct elements to use more readable names More comments (mostly function and structure slot comments) Other things: Changed 'USE_WHOLE_KEY' to a big number to not interfer with long keys Ensure that tail block are at least of size 'MIN_TAIL_SIZE' Allow longer keys and key parts than before (don't limit Maria interface by HA_MAX_KEY_LENGTH) Use ma_chsize() to write initial bitmap page Added checking if using file with wrong block_size Added issing types to type_names[] (for maria_chk -d) Added maria_max_key_length() include/maria.h: Changed maria_portable_size_char_ptr to portable_size_char_ptr and moved it to my_handler.h Removed not used variable maria_delay_rec_write. More comments include/my_handler.h: Added portable_sizeof_char_ptr include/myisam.h: Changed mi_portable_size_char_ptr to portable_size_char_ptr and moved it to my_handler.h mysql-test/r/maria.result: Fix results when we now have a longer key length mysql-test/t/maria.test: More tests mysys/my_pread.c: Code cleanup sql/net_serv.cc: Changed warning to note (as in main 5.1 tree) to avoid not critical failing tests sql/sql_select.cc: Use portable_sizeof_char_ptr storage/maria/ha_maria.cc: Added max_supported_key_length(), as this is not a trival function anymore storage/maria/ha_maria.h: Moved max_supported_key_length(), as this is not a trival function anymore storage/maria/ma_bitmap.c: Lots of new comments Added maria_bitmap_marker[] to mark 2 last bytes of each bitmap (for corruption detection) Trivial code changes (based on review comments) storage/maria/ma_blockrec.c: More code comments Renamed _block_row() functions to _block_record() Trivial code changes, based on review comments Moved Code from maria_close() to _ma_end_block_record() Some function renames to make things more understandable DIR_ENTRY_OFFSET -> DIR_COUNT_OFFSET keybuff_used -> keyread_buff_used ma_recordpos_to_offset -> ma_recordpos_to_dir_entry Changed some 'rec' named variables to 'column'. Ensure that tail block are at least of size 'MIN_TAIL_SIZE' storage/maria/ma_blockrec.h: More comments DIRCOUNT_SIZE -> DIR_COUNT_SIZE Added define for maira_bitmap_marker[] ma_recordpos_to_offset -> ma_recordpos_to_dir_entry xxx_block_row() -> xxx_block_record() Made _ma_read_bitmap_page() static storage/maria/ma_check.c: More comments ma_recordpos_to_offset() -> ma_recordpos_to_dir_entry() DIR_ENTRY_OFFSET -> DIR_COUNT_OFFSET rec variables -> column variables recdef -> columndef storage/maria/ma_checksum.c: rec -> column Avoid an 'if' in _ma_checksum() for the common case storage/maria/ma_close.c: Moved resetting of info->dfile to ma_end_once_block_record() storage/maria/ma_create.c: Some variable changes to make things more readable: recinfo -> columndef rec -> column rec_end -> end_column record_type -> datafile_type ma_recinfo_write() -> ma_columndef_write() Fixed wrong setting of 'data_file_length'; Now max_rows should be calculated correctly New check if too long key. Use ma_chsize() to write bitmap page. storage/maria/ma_delete.c: keybuff_used -> keyread_buff_used storage/maria/ma_dynrec.c: rec -> columndef rec_length -> column_length maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr Better comment for _ma_read_rnd_dynamic_record() storage/maria/ma_ft_eval.c: maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/maria/ma_ft_test1.c: maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/maria/ma_ft_update.c: keybuff_used -> keyread_buff_used storage/maria/ma_info.c: More comments storage/maria/ma_open.c: Added checking if using file with wrong block_size New checking of max_key_length rec -> columndef _ma_recinfo_write -> _ma_columndef_write Don't change block_size (as this is checked in ma_create()) More comments storage/maria/ma_packrec.c: Trivial code changes rec -> columndef maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/maria/ma_page.c: keybuff_used -> keyread_buff_used storage/maria/ma_rkey.c: Removed not needded empty line storage/maria/ma_rrnd.c: Removed not used variable storage/maria/ma_rt_index.c: keybuff_used -> keyread_buff_used storage/maria/ma_search.c: keybuff_used -> keyread_buff_used Trivial code changes storage/maria/ma_sp_test.c: maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/maria/ma_test1.c: maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/maria/ma_test2.c: maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/maria/ma_update.c: Updated comment storage/maria/ma_write.c: keybuff_used -> keyread_buff_used storage/maria/maria_chk.c: Added missing types to type_names[] Removed not used variable rec -> columndef Replaced some numbers with define flags storage/maria/maria_def.h: More comments Added 'MARIA_INDEX_MIN_OVERHEAD_SIZE' rec -> columndef keybuff_used -> keyread_buff_used _ma_recinfo_write -> _ma_culumndef_write _ma_recinfo_read -> _ma_columndef_read Changed 'USE_WHOLE_KEY' to a big number to not interfer with long keys Added maria_max_key_length() storage/maria/maria_pack.c: Updated message strings rec -> columndef maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr More comments storage/myisam/ft_eval.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/ft_test1.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/mi_checksum.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/mi_create.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/mi_dynrec.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/mi_open.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/mi_packrec.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/mi_rkey.c: Unlock mutex also in case of error storage/myisam/mi_test1.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/mi_test2.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/myisampack.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr storage/myisam/sp_test.c: mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr support-files/magic: Fixed typo
177 lines
6.1 KiB
C
177 lines
6.1 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 */
|
|
|
|
/* Read record based on a key */
|
|
|
|
#include "maria_def.h"
|
|
#include "ma_rt_index.h"
|
|
|
|
/* Read a record using key */
|
|
/* Ordinary search_flag is 0 ; Give error if no record with key */
|
|
|
|
int maria_rkey(MARIA_HA *info, byte *buf, int inx, const byte *key,
|
|
uint key_len, enum ha_rkey_function search_flag)
|
|
{
|
|
byte *key_buff;
|
|
MARIA_SHARE *share=info->s;
|
|
MARIA_KEYDEF *keyinfo;
|
|
HA_KEYSEG *last_used_keyseg;
|
|
uint pack_key_length, use_key_length, nextflag;
|
|
DBUG_ENTER("maria_rkey");
|
|
DBUG_PRINT("enter", ("base: 0x%lx buf: 0x%lx inx: %d search_flag: %d",
|
|
(long) info, (long) buf, inx, search_flag));
|
|
|
|
if ((inx = _ma_check_index(info,inx)) < 0)
|
|
DBUG_RETURN(my_errno);
|
|
|
|
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
|
info->last_key_func= search_flag;
|
|
keyinfo= share->keyinfo + inx;
|
|
|
|
if (info->once_flags & USE_PACKED_KEYS)
|
|
{
|
|
info->once_flags&= ~USE_PACKED_KEYS; /* Reset flag */
|
|
/*
|
|
key is already packed!; This happens when we are using a MERGE TABLE
|
|
*/
|
|
key_buff= info->lastkey+info->s->base.max_key_length;
|
|
pack_key_length= key_len;
|
|
bmove(key_buff,key,key_len);
|
|
last_used_keyseg= 0;
|
|
}
|
|
else
|
|
{
|
|
if (key_len == 0)
|
|
key_len=USE_WHOLE_KEY;
|
|
/* Save the packed key for later use in the second buffer of lastkey. */
|
|
key_buff=info->lastkey+info->s->base.max_key_length;
|
|
pack_key_length= _ma_pack_key(info,(uint) inx, key_buff, key,
|
|
key_len, &last_used_keyseg);
|
|
/* Save packed_key_length for use by the MERGE engine. */
|
|
info->pack_key_length= pack_key_length;
|
|
DBUG_EXECUTE("key", _ma_print_key(DBUG_FILE, keyinfo->seg,
|
|
key_buff, pack_key_length););
|
|
}
|
|
|
|
if (fast_ma_readinfo(info))
|
|
goto err;
|
|
if (share->concurrent_insert)
|
|
rw_rdlock(&share->key_root_lock[inx]);
|
|
|
|
nextflag=maria_read_vec[search_flag];
|
|
use_key_length=pack_key_length;
|
|
if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST)))
|
|
use_key_length=USE_WHOLE_KEY;
|
|
|
|
switch (info->s->keyinfo[inx].key_alg) {
|
|
#ifdef HAVE_RTREE_KEYS
|
|
case HA_KEY_ALG_RTREE:
|
|
if (maria_rtree_find_first(info,inx,key_buff,use_key_length,nextflag) < 0)
|
|
{
|
|
maria_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno= HA_ERR_CRASHED;
|
|
info->cur_row.lastpos= HA_OFFSET_ERROR;
|
|
}
|
|
break;
|
|
#endif
|
|
case HA_KEY_ALG_BTREE:
|
|
default:
|
|
if (!_ma_search(info, keyinfo, key_buff, use_key_length,
|
|
maria_read_vec[search_flag],
|
|
info->s->state.key_root[inx]) &&
|
|
share->concurrent_insert)
|
|
{
|
|
/*
|
|
If we searching for a partial key (or using >, >=, < or <=) and
|
|
the data is outside of the data file, we need to continue searching
|
|
for the first key inside the data file
|
|
*/
|
|
if (info->cur_row.lastpos >= info->state->data_file_length &&
|
|
(search_flag != HA_READ_KEY_EXACT ||
|
|
last_used_keyseg != keyinfo->seg + keyinfo->keysegs))
|
|
{
|
|
do
|
|
{
|
|
uint not_used[2];
|
|
/*
|
|
Skip rows that are inserted by other threads since we got a lock
|
|
Note that this can only happen if we are not searching after an
|
|
full length exact key, because the keys are sorted
|
|
according to position
|
|
*/
|
|
if (_ma_search_next(info, keyinfo, info->lastkey,
|
|
info->lastkey_length,
|
|
maria_readnext_vec[search_flag],
|
|
info->s->state.key_root[inx]))
|
|
break;
|
|
/*
|
|
Check that the found key does still match the search.
|
|
_ma_search_next() delivers the next key regardless of its
|
|
value.
|
|
*/
|
|
if (search_flag == HA_READ_KEY_EXACT &&
|
|
ha_key_cmp(keyinfo->seg, (uchar*) key_buff,
|
|
(uchar*) info->lastkey, use_key_length,
|
|
SEARCH_FIND, not_used))
|
|
{
|
|
my_errno= HA_ERR_KEY_NOT_FOUND;
|
|
info->cur_row.lastpos= HA_OFFSET_ERROR;
|
|
break;
|
|
}
|
|
} while (info->cur_row.lastpos >= info->state->data_file_length);
|
|
}
|
|
}
|
|
}
|
|
if (share->concurrent_insert)
|
|
rw_unlock(&share->key_root_lock[inx]);
|
|
|
|
if (info->cur_row.lastpos == HA_OFFSET_ERROR)
|
|
{
|
|
fast_ma_writeinfo(info);
|
|
goto err;
|
|
}
|
|
|
|
/* Calculate length of the found key; Used by maria_rnext_same */
|
|
if ((keyinfo->flag & HA_VAR_LENGTH_KEY) && last_used_keyseg)
|
|
info->last_rkey_length= _ma_keylength_part(keyinfo, info->lastkey,
|
|
last_used_keyseg);
|
|
else
|
|
info->last_rkey_length= pack_key_length;
|
|
|
|
/* Check if we don't want to have record back, only error message */
|
|
if (!buf)
|
|
{
|
|
fast_ma_writeinfo(info);
|
|
DBUG_RETURN(0);
|
|
}
|
|
if (!(*info->read_record)(info, buf, info->cur_row.lastpos))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
info->cur_row.lastpos= HA_OFFSET_ERROR; /* Didn't find row */
|
|
|
|
err:
|
|
/* Store last used key as a base for read next */
|
|
memcpy(info->lastkey,key_buff,pack_key_length);
|
|
info->last_rkey_length= pack_key_length;
|
|
bzero((char*) info->lastkey+pack_key_length,info->s->base.rec_reflength);
|
|
info->lastkey_length=pack_key_length+info->s->base.rec_reflength;
|
|
|
|
if (search_flag == HA_READ_AFTER_KEY)
|
|
info->update|=HA_STATE_NEXT_FOUND; /* Previous gives last row */
|
|
DBUG_RETURN(my_errno);
|
|
} /* _ma_rkey */
|