mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +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
342 lines
11 KiB
C
342 lines
11 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 and write key blocks */
|
||
|
||
#include "maria_def.h"
|
||
#include "trnman.h"
|
||
#include "ma_key_recover.h"
|
||
|
||
/* Fetch a key-page in memory */
|
||
|
||
uchar *_ma_fetch_keypage(register MARIA_HA *info,
|
||
MARIA_KEYDEF *keyinfo __attribute__ ((unused)),
|
||
my_off_t page, enum pagecache_page_lock lock,
|
||
int level, uchar *buff,
|
||
int return_buffer __attribute__ ((unused)),
|
||
MARIA_PINNED_PAGE **page_link_res)
|
||
{
|
||
uchar *tmp;
|
||
uint page_size;
|
||
MARIA_PINNED_PAGE page_link;
|
||
MARIA_SHARE *share= info->s;
|
||
uint block_size= share->block_size;
|
||
DBUG_ENTER("_ma_fetch_keypage");
|
||
DBUG_PRINT("enter",("page: %ld", (long) page));
|
||
|
||
tmp= pagecache_read(share->pagecache, &share->kfile,
|
||
page / block_size, level, buff,
|
||
share->page_type, lock, &page_link.link);
|
||
|
||
if (lock != PAGECACHE_LOCK_LEFT_UNLOCKED)
|
||
{
|
||
DBUG_ASSERT(lock == PAGECACHE_LOCK_WRITE);
|
||
page_link.unlock= PAGECACHE_LOCK_WRITE_UNLOCK;
|
||
page_link.changed= 0;
|
||
push_dynamic(&info->pinned_pages, (void*) &page_link);
|
||
*page_link_res= dynamic_element(&info->pinned_pages,
|
||
info->pinned_pages.elements-1,
|
||
MARIA_PINNED_PAGE *);
|
||
}
|
||
|
||
if (tmp == info->buff)
|
||
info->keyread_buff_used=1;
|
||
else if (!tmp)
|
||
{
|
||
DBUG_PRINT("error",("Got errno: %d from pagecache_read",my_errno));
|
||
info->last_keypage=HA_OFFSET_ERROR;
|
||
maria_print_error(share, HA_ERR_CRASHED);
|
||
my_errno=HA_ERR_CRASHED;
|
||
DBUG_RETURN(0);
|
||
}
|
||
info->last_keypage=page;
|
||
#ifdef EXTRA_DEBUG
|
||
page_size= _ma_get_page_used(share, tmp);
|
||
if (page_size < 4 || page_size > block_size ||
|
||
_ma_get_keynr(share, tmp) != keyinfo->key_nr)
|
||
{
|
||
DBUG_PRINT("error",("page %lu had wrong page length: %u keynr: %u",
|
||
(ulong) page, page_size,
|
||
_ma_get_keynr(share, tmp)));
|
||
DBUG_DUMP("page", (char*) tmp, page_size);
|
||
info->last_keypage = HA_OFFSET_ERROR;
|
||
maria_print_error(share, HA_ERR_CRASHED);
|
||
my_errno= HA_ERR_CRASHED;
|
||
tmp= 0;
|
||
}
|
||
#endif
|
||
DBUG_RETURN(tmp);
|
||
} /* _ma_fetch_keypage */
|
||
|
||
|
||
/* Write a key-page on disk */
|
||
|
||
int _ma_write_keypage(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
|
||
my_off_t page, enum pagecache_page_lock lock,
|
||
int level, uchar *buff)
|
||
{
|
||
MARIA_SHARE *share= info->s;
|
||
MARIA_PINNED_PAGE page_link;
|
||
uint block_size= share->block_size;
|
||
int res;
|
||
DBUG_ENTER("_ma_write_keypage");
|
||
|
||
#ifdef EXTRA_DEBUG /* Safety check */
|
||
{
|
||
uint page_length, nod;
|
||
_ma_get_used_and_nod(share, buff, page_length, nod);
|
||
if (page < share->base.keystart ||
|
||
page+block_size > info->state->key_file_length ||
|
||
(page & (MARIA_MIN_KEY_BLOCK_LENGTH-1)))
|
||
{
|
||
DBUG_PRINT("error",("Trying to write inside key status region: "
|
||
"key_start: %lu length: %lu page: %lu",
|
||
(long) share->base.keystart,
|
||
(long) info->state->key_file_length,
|
||
(long) page));
|
||
my_errno=EINVAL;
|
||
DBUG_ASSERT(0);
|
||
DBUG_RETURN((-1));
|
||
}
|
||
DBUG_PRINT("page",("write page at: %lu",(long) page));
|
||
DBUG_DUMP("buff", buff, page_length);
|
||
DBUG_ASSERT(page_length >= share->keypage_header + nod +
|
||
keyinfo->minlength || maria_in_recovery);
|
||
}
|
||
#endif
|
||
|
||
/* Verify that keynr is correct */
|
||
DBUG_ASSERT(_ma_get_keynr(share, buff) == keyinfo->key_nr);
|
||
|
||
#if defined(EXTRA_DEBUG) && defined(HAVE_purify)
|
||
{
|
||
/* This is here to catch uninitialized bytes */
|
||
ulong crc= my_checksum(0, buff, block_size - KEYPAGE_CHECKSUM_SIZE);
|
||
int4store(buff + block_size - KEYPAGE_CHECKSUM_SIZE, crc);
|
||
}
|
||
#endif
|
||
|
||
#ifdef IDENTICAL_PAGES_AFTER_RECOVERY
|
||
{
|
||
uint length= _ma_get_page_used(share, buff);
|
||
DBUG_ASSERT(length <= block_size - KEYPAGE_CHECKSUM_SIZE);
|
||
bzero(buff + length, block_size - length);
|
||
}
|
||
#endif
|
||
DBUG_ASSERT(share->pagecache->block_size == block_size);
|
||
if (!(share->options & HA_OPTION_PAGE_CHECKSUM))
|
||
bfill(buff + block_size - KEYPAGE_CHECKSUM_SIZE,
|
||
KEYPAGE_CHECKSUM_SIZE, (uchar) 255);
|
||
|
||
res= pagecache_write(share->pagecache,
|
||
&share->kfile, page / block_size,
|
||
level, buff, share->page_type,
|
||
lock,
|
||
lock == PAGECACHE_LOCK_LEFT_WRITELOCKED ?
|
||
PAGECACHE_PIN_LEFT_PINNED :
|
||
PAGECACHE_PIN,
|
||
PAGECACHE_WRITE_DELAY, &page_link.link,
|
||
LSN_IMPOSSIBLE);
|
||
|
||
if (lock == PAGECACHE_LOCK_WRITE)
|
||
{
|
||
/* It was not locked before, we have to unlock it when we unpin pages */
|
||
page_link.unlock= PAGECACHE_LOCK_WRITE_UNLOCK;
|
||
page_link.changed= 1;
|
||
push_dynamic(&info->pinned_pages, (void*) &page_link);
|
||
}
|
||
DBUG_RETURN(res);
|
||
|
||
} /* maria_write_keypage */
|
||
|
||
|
||
/*
|
||
@brief Put page in free list
|
||
|
||
@fn _ma_dispose()
|
||
@param info Maria handle
|
||
@param pos Address to page
|
||
@param page_not_read 1 if page has not yet been read
|
||
|
||
@note
|
||
The page at 'pos' must have been read with a write lock
|
||
|
||
@return
|
||
@retval 0 ok
|
||
<20>retval 1 error
|
||
|
||
*/
|
||
|
||
int _ma_dispose(register MARIA_HA *info, my_off_t pos, my_bool page_not_read)
|
||
{
|
||
my_off_t old_link;
|
||
uchar buff[MAX_KEYPAGE_HEADER_SIZE+8];
|
||
ulonglong page_no;
|
||
MARIA_SHARE *share= info->s;
|
||
MARIA_PINNED_PAGE page_link;
|
||
uint block_size= share->block_size;
|
||
int result= 0;
|
||
enum pagecache_page_lock lock_method;
|
||
enum pagecache_page_pin pin_method;
|
||
DBUG_ENTER("_ma_dispose");
|
||
DBUG_PRINT("enter",("pos: %ld", (long) pos));
|
||
DBUG_ASSERT(pos % block_size == 0);
|
||
|
||
(void) _ma_lock_key_del(info, 0);
|
||
|
||
old_link= share->current_key_del;
|
||
share->current_key_del= pos;
|
||
page_no= pos / block_size;
|
||
bzero(buff, share->keypage_header);
|
||
_ma_store_keynr(share, buff, (uchar) MARIA_DELETE_KEY_NR);
|
||
mi_sizestore(buff + share->keypage_header, old_link);
|
||
share->state.changed|= STATE_NOT_SORTED_PAGES;
|
||
|
||
if (share->now_transactional)
|
||
{
|
||
LSN lsn;
|
||
uchar log_data[FILEID_STORE_SIZE + PAGE_STORE_SIZE * 2];
|
||
LEX_STRING log_array[TRANSLOG_INTERNAL_PARTS + 1];
|
||
my_off_t page;
|
||
|
||
/* Store address of deleted page */
|
||
page_store(log_data + FILEID_STORE_SIZE, page_no);
|
||
|
||
/* Store link to next unused page (the link that is written to page) */
|
||
page= (old_link == HA_OFFSET_ERROR ? IMPOSSIBLE_PAGE_NO :
|
||
old_link / block_size);
|
||
page_store(log_data + FILEID_STORE_SIZE + PAGE_STORE_SIZE, page);
|
||
|
||
log_array[TRANSLOG_INTERNAL_PARTS + 0].str= (char*) log_data;
|
||
log_array[TRANSLOG_INTERNAL_PARTS + 0].length= sizeof(log_data);
|
||
|
||
if (translog_write_record(&lsn, LOGREC_REDO_INDEX_FREE_PAGE,
|
||
info->trn, info, sizeof(log_data),
|
||
TRANSLOG_INTERNAL_PARTS + 1, log_array,
|
||
log_data, NULL))
|
||
result= 1;
|
||
}
|
||
|
||
if (page_not_read)
|
||
{
|
||
lock_method= PAGECACHE_LOCK_WRITE;
|
||
pin_method= PAGECACHE_PIN;
|
||
}
|
||
else
|
||
{
|
||
lock_method= PAGECACHE_LOCK_LEFT_WRITELOCKED;
|
||
pin_method= PAGECACHE_PIN_LEFT_PINNED;
|
||
}
|
||
|
||
if (pagecache_write_part(share->pagecache,
|
||
&share->kfile, (pgcache_page_no_t) page_no,
|
||
PAGECACHE_PRIORITY_LOW, buff,
|
||
share->page_type,
|
||
lock_method, pin_method,
|
||
PAGECACHE_WRITE_DELAY, &page_link.link,
|
||
LSN_IMPOSSIBLE,
|
||
0, share->keypage_header+8, 0, 0))
|
||
result= 1;
|
||
|
||
#ifdef IDENTICAL_PAGES_AFTER_RECOVERY
|
||
{
|
||
uchar *page_buff= pagecache_block_link_to_buffer(page_link.link);
|
||
bzero(page_buff + share->keypage_header + 8,
|
||
block_size - share->keypage_header - 8 - KEYPAGE_CHECKSUM_SIZE);
|
||
}
|
||
#endif
|
||
|
||
if (page_not_read)
|
||
{
|
||
/* It was not locked before, we have to unlock it when we unpin pages */
|
||
page_link.unlock= PAGECACHE_LOCK_WRITE_UNLOCK;
|
||
page_link.changed= 1;
|
||
push_dynamic(&info->pinned_pages, (void*) &page_link);
|
||
}
|
||
|
||
DBUG_RETURN(result);
|
||
} /* _ma_dispose */
|
||
|
||
|
||
/**
|
||
@brief Get address for free page to use
|
||
|
||
@fn _ma_new()
|
||
@param info Maria handle
|
||
@param level Type of key block (caching priority for pagecache)
|
||
@param page_link Pointer to page in page cache if read. One can
|
||
check if this is used by checking if
|
||
page_link->changed != 0
|
||
|
||
@return
|
||
HA_OFFSET_ERROR File is full or page read error
|
||
# Page address to use
|
||
*/
|
||
|
||
my_off_t _ma_new(register MARIA_HA *info, int level,
|
||
MARIA_PINNED_PAGE **page_link)
|
||
|
||
{
|
||
my_off_t pos;
|
||
MARIA_SHARE *share= info->s;
|
||
uint block_size= share->block_size;
|
||
DBUG_ENTER("_ma_new");
|
||
|
||
if (_ma_lock_key_del(info, 1))
|
||
{
|
||
if (info->state->key_file_length >=
|
||
share->base.max_key_file_length - block_size)
|
||
{
|
||
my_errno=HA_ERR_INDEX_FILE_FULL;
|
||
DBUG_RETURN(HA_OFFSET_ERROR);
|
||
}
|
||
pos= info->state->key_file_length;
|
||
info->state->key_file_length+= block_size;
|
||
(*page_link)->changed= 0;
|
||
(*page_link)->write_lock= PAGECACHE_LOCK_WRITE;
|
||
}
|
||
else
|
||
{
|
||
uchar *buff;
|
||
/*
|
||
TODO: replace PAGECACHE_PLAIN_PAGE with PAGECACHE_LSN_PAGE when
|
||
LSN on the pages will be implemented
|
||
*/
|
||
pos= share->current_key_del; /* Protected */
|
||
DBUG_ASSERT(share->pagecache->block_size == block_size);
|
||
if (!(buff= pagecache_read(share->pagecache,
|
||
&share->kfile, pos / block_size, level,
|
||
0, share->page_type,
|
||
PAGECACHE_LOCK_WRITE, &(*page_link)->link)))
|
||
pos= HA_OFFSET_ERROR;
|
||
else
|
||
{
|
||
share->current_key_del= mi_sizekorr(buff+share->keypage_header);
|
||
DBUG_ASSERT(share->current_key_del != share->state.key_del &&
|
||
share->current_key_del);
|
||
}
|
||
|
||
(*page_link)->unlock= PAGECACHE_LOCK_WRITE_UNLOCK;
|
||
(*page_link)->write_lock= PAGECACHE_LOCK_WRITE;
|
||
(*page_link)->changed= 0;
|
||
push_dynamic(&info->pinned_pages, (void*) *page_link);
|
||
*page_link= dynamic_element(&info->pinned_pages,
|
||
info->pinned_pages.elements-1,
|
||
MARIA_PINNED_PAGE *);
|
||
}
|
||
share->state.changed|= STATE_NOT_SORTED_PAGES;
|
||
DBUG_PRINT("exit",("Pos: %ld",(long) pos));
|
||
DBUG_RETURN(pos);
|
||
} /* _ma_new */
|