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
140 lines
4.5 KiB
C
140 lines
4.5 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 */
|
|
|
|
/* Return useful base information for an open table */
|
|
|
|
#include "maria_def.h"
|
|
#ifdef __WIN__
|
|
#include <sys/stat.h>
|
|
#endif
|
|
|
|
/* Get position to last record */
|
|
|
|
MARIA_RECORD_POS maria_position(MARIA_HA *info)
|
|
{
|
|
return info->cur_row.lastpos;
|
|
}
|
|
|
|
|
|
/* Get information about the table */
|
|
/* if flag == 2 one get current info (no sync from database */
|
|
|
|
int maria_status(MARIA_HA *info, register MARIA_INFO *x, uint flag)
|
|
{
|
|
MY_STAT state;
|
|
MARIA_SHARE *share=info->s;
|
|
DBUG_ENTER("maria_status");
|
|
|
|
x->recpos= info->cur_row.lastpos;
|
|
if (flag == HA_STATUS_POS)
|
|
DBUG_RETURN(0); /* Compatible with ISAM */
|
|
if (!(flag & HA_STATUS_NO_LOCK))
|
|
{
|
|
pthread_mutex_lock(&share->intern_lock);
|
|
VOID(_ma_readinfo(info,F_RDLCK,0));
|
|
fast_ma_writeinfo(info);
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
}
|
|
if (flag & HA_STATUS_VARIABLE)
|
|
{
|
|
x->records = info->state->records;
|
|
x->deleted = info->state->del;
|
|
x->delete_length = info->state->empty;
|
|
x->data_file_length =info->state->data_file_length;
|
|
x->index_file_length=info->state->key_file_length;
|
|
|
|
x->keys = share->state.header.keys;
|
|
x->check_time = share->state.check_time;
|
|
x->mean_reclength = info->state->records ?
|
|
(ulong) ((info->state->data_file_length-info->state->empty)/
|
|
info->state->records) : (ulong) share->min_pack_length;
|
|
}
|
|
if (flag & HA_STATUS_ERRKEY)
|
|
{
|
|
x->errkey= info->errkey;
|
|
x->dup_key_pos= info->dup_key_pos;
|
|
}
|
|
if (flag & HA_STATUS_CONST)
|
|
{
|
|
x->reclength = share->base.reclength;
|
|
x->max_data_file_length=share->base.max_data_file_length;
|
|
x->max_index_file_length=info->s->base.max_key_file_length;
|
|
x->filenr = info->dfile;
|
|
x->options = share->options;
|
|
x->create_time=share->state.create_time;
|
|
x->reflength= maria_get_pointer_length(share->base.max_data_file_length,
|
|
maria_data_pointer_size);
|
|
x->record_offset= (info->s->data_file_type == STATIC_RECORD ?
|
|
share->base.pack_reclength: 0);
|
|
x->sortkey= -1; /* No clustering */
|
|
x->rec_per_key = share->state.rec_per_key_part;
|
|
x->key_map = share->state.key_map;
|
|
x->data_file_name = share->data_file_name;
|
|
x->index_file_name = share->index_file_name;
|
|
x->data_file_type = share->data_file_type;
|
|
}
|
|
if ((flag & HA_STATUS_TIME) && !my_fstat(info->dfile,&state,MYF(0)))
|
|
x->update_time=state.st_mtime;
|
|
else
|
|
x->update_time=0;
|
|
if (flag & HA_STATUS_AUTO)
|
|
{
|
|
x->auto_increment= share->state.auto_increment+1;
|
|
if (!x->auto_increment) /* This shouldn't happen */
|
|
x->auto_increment= ~(ulonglong) 0;
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Write a message to the error log.
|
|
|
|
SYNOPSIS
|
|
_ma_report_error()
|
|
file_name Name of table file (e.g. index_file_name).
|
|
errcode Error number.
|
|
|
|
DESCRIPTION
|
|
This function supplies my_error() with a table name. Most error
|
|
messages need one. Since string arguments in error messages are limited
|
|
to 64 characters by convention, we ensure that in case of truncation,
|
|
that the end of the index file path is in the message. This contains
|
|
the most valuable information (the table name and the database name).
|
|
|
|
RETURN
|
|
void
|
|
*/
|
|
|
|
void _ma_report_error(int errcode, const char *file_name)
|
|
{
|
|
uint length;
|
|
DBUG_ENTER("_ma_report_error");
|
|
DBUG_PRINT("enter",("errcode %d, table '%s'", errcode, file_name));
|
|
|
|
if ((length= strlen(file_name)) > 64)
|
|
{
|
|
/* we first remove the directory */
|
|
uint dir_length= dirname_length(file_name);
|
|
file_name+= dir_length;
|
|
if ((length-= dir_length) > 64)
|
|
{
|
|
/* still too long, chop start of table name */
|
|
file_name+= length - 64;
|
|
}
|
|
}
|
|
my_error(errcode, MYF(ME_NOREFRESH), file_name);
|
|
DBUG_VOID_RETURN;
|
|
}
|