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
7.2 KiB
C
177 lines
7.2 KiB
C
/* Copyright (C) 2007 Michael Widenius
|
|
|
|
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 */
|
|
|
|
/*
|
|
Storage of records in block
|
|
*/
|
|
|
|
#define LSN_SIZE 7
|
|
#define DIR_COUNT_SIZE 1 /* Stores number of rows on page */
|
|
#define EMPTY_SPACE_SIZE 2 /* Stores empty space on page */
|
|
#define PAGE_TYPE_SIZE 1
|
|
#define PAGE_SUFFIX_SIZE 0 /* Bytes for page suffix */
|
|
#define PAGE_HEADER_SIZE (LSN_SIZE + DIR_COUNT_SIZE + EMPTY_SPACE_SIZE +\
|
|
PAGE_TYPE_SIZE)
|
|
#define PAGE_OVERHEAD_SIZE (PAGE_HEADER_SIZE + DIR_ENTRY_SIZE + \
|
|
PAGE_SUFFIX_SIZE)
|
|
#define BLOCK_RECORD_POINTER_SIZE 6
|
|
|
|
#define FULL_PAGE_SIZE(block_size) ((block_size) - LSN_SIZE - PAGE_TYPE_SIZE)
|
|
|
|
#define ROW_EXTENT_PAGE_SIZE 5
|
|
#define ROW_EXTENT_COUNT_SIZE 2
|
|
#define ROW_EXTENT_SIZE (ROW_EXTENT_PAGE_SIZE + ROW_EXTENT_COUNT_SIZE)
|
|
#define TAIL_BIT 0x8000 /* Bit in page_count to signify tail */
|
|
/* Number of extents reserved MARIA_BITMAP_BLOCKS to store head part */
|
|
#define ELEMENTS_RESERVED_FOR_MAIN_PART 4
|
|
/* Fields before 'row->null_field_lengths' used by find_where_to_split_row */
|
|
#define EXTRA_LENGTH_FIELDS 3
|
|
|
|
/* Size for the different parts in the row header (and head page) */
|
|
|
|
#define FLAG_SIZE 1
|
|
#define TRANSID_SIZE 6
|
|
#define VERPTR_SIZE 7
|
|
#define DIR_ENTRY_SIZE 4
|
|
#define FIELD_OFFSET_SIZE 2 /* size of pointers to field starts */
|
|
|
|
/* Minimum header size needed for a new row */
|
|
#define BASE_ROW_HEADER_SIZE FLAG_SIZE
|
|
#define TRANS_ROW_EXTRA_HEADER_SIZE TRANSID_SIZE
|
|
|
|
#define PAGE_TYPE_MASK 127
|
|
enum en_page_type { UNALLOCATED_PAGE, HEAD_PAGE, TAIL_PAGE, BLOB_PAGE, MAX_PAGE_TYPE };
|
|
|
|
#define PAGE_TYPE_OFFSET LSN_SIZE
|
|
#define DIR_COUNT_OFFSET LSN_SIZE+PAGE_TYPE_SIZE
|
|
#define EMPTY_SPACE_OFFSET (DIR_COUNT_OFFSET + DIR_COUNT_SIZE)
|
|
|
|
#define PAGE_CAN_BE_COMPACTED 128 /* Bit in PAGE_TYPE */
|
|
|
|
/* Bits used for flag byte (one byte, first in record) */
|
|
#define ROW_FLAG_TRANSID 1
|
|
#define ROW_FLAG_VER_PTR 2
|
|
#define ROW_FLAG_DELETE_TRANSID 4
|
|
#define ROW_FLAG_NULLS_EXTENDED 8
|
|
#define ROW_FLAG_EXTENTS 128
|
|
#define ROW_FLAG_ALL (1+2+4+8+128)
|
|
|
|
/******** Variables that affects how data pages are utilized ********/
|
|
|
|
/* Minium size of tail segment */
|
|
#define MIN_TAIL_SIZE 32
|
|
|
|
/*
|
|
Fixed length part of Max possible header size; See row data structure
|
|
table in ma_blockrec.c.
|
|
*/
|
|
#define MAX_FIXED_HEADER_SIZE (FLAG_SIZE + 3 + ROW_EXTENT_SIZE + 3)
|
|
#define TRANS_MAX_FIXED_HEADER_SIZE (MAX_FIXED_HEADER_SIZE + \
|
|
TRANSID_SIZE + VERPTR_SIZE + \
|
|
TRANSID_SIZE)
|
|
|
|
/* We use 1 byte in record header to store number of directory entries */
|
|
#define MAX_ROWS_PER_PAGE 255
|
|
|
|
/* Bits for MARIA_BITMAP_BLOCKS->used */
|
|
/* We stored data on disk in the block */
|
|
#define BLOCKUSED_USED 1
|
|
/* Bitmap on disk is block->org_bitmap_value ; Happens only on update */
|
|
#define BLOCKUSED_USE_ORG_BITMAP 2
|
|
/* We stored tail data on disk for the block */
|
|
#define BLOCKUSED_TAIL 4
|
|
|
|
/******* defines that affects allocation (density) of data *******/
|
|
|
|
/*
|
|
If the tail part (from the main block or a blob) uses more than 75 % of
|
|
the size of page, store the tail on a full page instead of a shared
|
|
tail page.
|
|
*/
|
|
#define MAX_TAIL_SIZE(block_size) ((block_size) *3 / 4)
|
|
|
|
extern uchar maria_bitmap_marker[2];
|
|
|
|
/* Functions to convert MARIA_RECORD_POS to/from page:offset */
|
|
|
|
static inline MARIA_RECORD_POS ma_recordpos(ulonglong page, uint dir_entry)
|
|
{
|
|
DBUG_ASSERT(dir_entry <= 255);
|
|
return (MARIA_RECORD_POS) ((page << 8) | dir_entry);
|
|
}
|
|
|
|
static inline my_off_t ma_recordpos_to_page(MARIA_RECORD_POS record_pos)
|
|
{
|
|
return record_pos >> 8;
|
|
}
|
|
|
|
static inline my_off_t ma_recordpos_to_dir_entry(MARIA_RECORD_POS record_pos)
|
|
{
|
|
return record_pos & 255;
|
|
}
|
|
|
|
/* ma_blockrec.c */
|
|
void _ma_init_block_record_data(void);
|
|
my_bool _ma_once_init_block_record(MARIA_SHARE *share, File dfile);
|
|
my_bool _ma_once_end_block_record(MARIA_SHARE *share);
|
|
my_bool _ma_init_block_record(MARIA_HA *info);
|
|
void _ma_end_block_record(MARIA_HA *info);
|
|
|
|
my_bool _ma_update_block_record(MARIA_HA *info, MARIA_RECORD_POS pos,
|
|
const byte *record);
|
|
my_bool _ma_delete_block_record(MARIA_HA *info);
|
|
int _ma_read_block_record(MARIA_HA *info, byte *record,
|
|
MARIA_RECORD_POS record_pos);
|
|
int _ma_read_block_record2(MARIA_HA *info, byte *record,
|
|
byte *data, byte *end_of_data);
|
|
int _ma_scan_block_record(MARIA_HA *info, byte *record,
|
|
MARIA_RECORD_POS, my_bool);
|
|
my_bool _ma_cmp_block_unique(MARIA_HA *info, MARIA_UNIQUEDEF *def,
|
|
const byte *record, MARIA_RECORD_POS pos);
|
|
my_bool _ma_scan_init_block_record(MARIA_HA *info);
|
|
void _ma_scan_end_block_record(MARIA_HA *info);
|
|
|
|
MARIA_RECORD_POS _ma_write_init_block_record(MARIA_HA *info,
|
|
const byte *record);
|
|
my_bool _ma_write_block_record(MARIA_HA *info, const byte *record);
|
|
my_bool _ma_write_abort_block_record(MARIA_HA *info);
|
|
my_bool _ma_compare_block_record(register MARIA_HA *info,
|
|
register const byte *record);
|
|
|
|
/* ma_bitmap.c */
|
|
my_bool _ma_bitmap_init(MARIA_SHARE *share, File file);
|
|
my_bool _ma_bitmap_end(MARIA_SHARE *share);
|
|
my_bool _ma_flush_bitmap(MARIA_SHARE *share);
|
|
my_bool _ma_bitmap_find_place(MARIA_HA *info, MARIA_ROW *row,
|
|
MARIA_BITMAP_BLOCKS *result_blocks);
|
|
my_bool _ma_bitmap_release_unused(MARIA_HA *info, MARIA_BITMAP_BLOCKS *blocks);
|
|
my_bool _ma_bitmap_free_full_pages(MARIA_HA *info, const byte *extents,
|
|
uint count);
|
|
my_bool _ma_bitmap_set(MARIA_HA *info, ulonglong pos, my_bool head,
|
|
uint empty_space);
|
|
my_bool _ma_reset_full_page_bits(MARIA_HA *info, MARIA_FILE_BITMAP *bitmap,
|
|
ulonglong page, uint page_count);
|
|
uint _ma_free_size_to_head_pattern(MARIA_FILE_BITMAP *bitmap, uint size);
|
|
my_bool _ma_bitmap_find_new_place(MARIA_HA *info, MARIA_ROW *new_row,
|
|
ulonglong page, uint free_size,
|
|
MARIA_BITMAP_BLOCKS *result_blocks);
|
|
my_bool _ma_check_bitmap_data(MARIA_HA *info,
|
|
enum en_page_type page_type, ulonglong page,
|
|
uint empty_space, uint *bitmap_pattern);
|
|
my_bool _ma_check_if_right_bitmap_type(MARIA_HA *info,
|
|
enum en_page_type page_type,
|
|
ulonglong page,
|
|
uint *bitmap_pattern);
|
|
void _ma_bitmap_delete_all(MARIA_SHARE *share);
|