mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
e011c02e2f
From r5995 to r6043 Detailed revision comments: r5995 | marko | 2009-09-28 03:52:25 -0500 (Mon, 28 Sep 2009) | 17 lines branches/zip: Do not write to PAGE_INDEX_ID after page creation, not even when restoring an uncompressed page after a compression failure. btr_page_reorganize_low(): On compression failure, do not restore those page header fields that should not be affected by the reorganization. Instead, compare the fields. page_zip_decompress(): Add the parameter ibool all, for copying all page header fields. Pass the parameter all=TRUE on block read completion, redo log application, and page_zip_validate(); pass all=FALSE in all other cases. page_zip_reorganize(): Do not restore the uncompressed page on failure. It will be restored (to pre-modification state) by the caller anyway. rb://167, Issue #346 r5996 | marko | 2009-09-28 07:46:02 -0500 (Mon, 28 Sep 2009) | 4 lines branches/zip: Address Issue #350 in comments. lock_rec_queue_validate(), lock_rec_queue_validate(): Note that this debug code may violate the latching order and cause deadlocks. r5997 | marko | 2009-09-28 08:03:58 -0500 (Mon, 28 Sep 2009) | 12 lines branches/zip: Remove an assertion failure when the InnoDB data dictionary is inconsistent with the MySQL .frm file. ha_innobase::index_read(): When the index cannot be found, return an error. ha_innobase::change_active_index(): When prebuilt->index == NULL, set also prebuilt->index_usable = FALSE. This is not needed for correctness, because prebuilt->index_usable is only checked by row_search_for_mysql(), which requires prebuilt->index != NULL. This addresses Issue #349. Approved by Heikki Tuuri over IM. r6005 | vasil | 2009-09-29 03:09:52 -0500 (Tue, 29 Sep 2009) | 4 lines branches/zip: ChangeLog: wrap around 78th column, not earlier. r6006 | vasil | 2009-09-29 05:15:25 -0500 (Tue, 29 Sep 2009) | 4 lines branches/zip: Add ChangeLog entry for the release of 1.0.4. r6007 | vasil | 2009-09-29 08:19:59 -0500 (Tue, 29 Sep 2009) | 6 lines branches/zip: Fix the year, should be 2009. Pointed by: Calvin r6026 | marko | 2009-09-30 02:18:24 -0500 (Wed, 30 Sep 2009) | 1 line branches/zip: Add some debug assertions for checking FSEG_MAGIC_N. r6028 | marko | 2009-09-30 08:55:23 -0500 (Wed, 30 Sep 2009) | 3 lines branches/zip: recv_no_log_write: New debug flag for tracking down Mantis Issue #347. No modifications should be made to the database while recv_apply_hashed_log_recs() is about to complete. r6029 | calvin | 2009-09-30 15:32:02 -0500 (Wed, 30 Sep 2009) | 4 lines branches/zip: non-functional changes Fix typo. r6031 | marko | 2009-10-01 06:24:33 -0500 (Thu, 01 Oct 2009) | 49 lines branches/zip: Clean up after a crash during DROP INDEX. When InnoDB crashes while dropping an index, ensure that the index will be completely dropped during crash recovery. row_merge_drop_index(): Before dropping an index, rename the index to start with TEMP_INDEX_PREFIX_STR and commit the change, so that row_merge_drop_temp_indexes() will drop the index after crash recovery if the server crashes while dropping the index. fseg_inode_try_get(): New function, forked from fseg_inode_get(). Return NULL if the file segment index node is free. fseg_inode_get(): Assert that the file segment index node is not free. fseg_free_step(): If the file segment index node is already free, print a diagnostic message and return TRUE. fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that allocated-and-freed file segment index nodes can be better distinguished from uninitialized ones. This is rb://174, addressing Issue #348. Tested by restarting mysqld upon the completion of the added log_write_up_to() invocation below, during DROP INDEX. The index was dropped after crash recovery, and re-issuing the DROP INDEX did not crash the server. Index: btr/btr0btr.c =================================================================== --- btr/btr0btr.c (revision 6026) +++ btr/btr0btr.c (working copy) @@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri #include "ibuf0ibuf.h" #include "trx0trx.h" +#include "log0log.h" /* Latching strategy of the InnoDB B-tree -------------------------------------- @@ -873,6 +874,8 @@ leaf_loop: goto leaf_loop; } + + log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE); top_loop: mtr_start(&mtr); r6033 | calvin | 2009-10-01 15:19:46 -0500 (Thu, 01 Oct 2009) | 4 lines branches/zip: fix a typo in error message Reported as bug#47763. r6043 | inaam | 2009-10-05 09:45:35 -0500 (Mon, 05 Oct 2009) | 12 lines branches/zip rb://176 Do not invalidate buffer pool while an LRU batch is active. Added code to buf_pool_invalidate() to wait for the running batches to finish. This patch also resets the state of buf_pool struct at invalidation. This addresses the concern where buf_pool->freed_page_clock becomes non-zero because we read in a system tablespace page for file format info at startup. Approved by: Marko
358 lines
9 KiB
C
358 lines
9 KiB
C
/*****************************************************************************
|
|
|
|
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
|
|
|
|
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
|
|
|
|
*****************************************************************************/
|
|
|
|
/**************************************************//**
|
|
@file mtr/mtr0mtr.c
|
|
Mini-transaction buffer
|
|
|
|
Created 11/26/1995 Heikki Tuuri
|
|
*******************************************************/
|
|
|
|
#include "mtr0mtr.h"
|
|
|
|
#ifdef UNIV_NONINL
|
|
#include "mtr0mtr.ic"
|
|
#endif
|
|
|
|
#include "buf0buf.h"
|
|
#include "page0types.h"
|
|
#include "mtr0log.h"
|
|
#include "log0log.h"
|
|
|
|
#ifndef UNIV_HOTBACKUP
|
|
# include "log0recv.h"
|
|
/*****************************************************************//**
|
|
Releases the item in the slot given. */
|
|
UNIV_INLINE
|
|
void
|
|
mtr_memo_slot_release(
|
|
/*==================*/
|
|
mtr_t* mtr, /*!< in: mtr */
|
|
mtr_memo_slot_t* slot) /*!< in: memo slot */
|
|
{
|
|
void* object;
|
|
ulint type;
|
|
|
|
ut_ad(mtr && slot);
|
|
|
|
object = slot->object;
|
|
type = slot->type;
|
|
|
|
if (UNIV_LIKELY(object != NULL)) {
|
|
if (type <= MTR_MEMO_BUF_FIX) {
|
|
buf_page_release((buf_block_t*)object, type, mtr);
|
|
} else if (type == MTR_MEMO_S_LOCK) {
|
|
rw_lock_s_unlock((rw_lock_t*)object);
|
|
#ifdef UNIV_DEBUG
|
|
} else if (type != MTR_MEMO_X_LOCK) {
|
|
ut_ad(type == MTR_MEMO_MODIFY);
|
|
ut_ad(mtr_memo_contains(mtr, object,
|
|
MTR_MEMO_PAGE_X_FIX));
|
|
#endif /* UNIV_DEBUG */
|
|
} else {
|
|
rw_lock_x_unlock((rw_lock_t*)object);
|
|
}
|
|
}
|
|
|
|
slot->object = NULL;
|
|
}
|
|
|
|
/**********************************************************//**
|
|
Releases the mlocks and other objects stored in an mtr memo. They are released
|
|
in the order opposite to which they were pushed to the memo. NOTE! It is
|
|
essential that the x-rw-lock on a modified buffer page is not released before
|
|
buf_page_note_modification is called for that page! Otherwise, some thread
|
|
might race to modify it, and the flush list sort order on lsn would be
|
|
destroyed. */
|
|
UNIV_INLINE
|
|
void
|
|
mtr_memo_pop_all(
|
|
/*=============*/
|
|
mtr_t* mtr) /*!< in: mtr */
|
|
{
|
|
mtr_memo_slot_t* slot;
|
|
dyn_array_t* memo;
|
|
ulint offset;
|
|
|
|
ut_ad(mtr);
|
|
ut_ad(mtr->magic_n == MTR_MAGIC_N);
|
|
ut_ad(mtr->state == MTR_COMMITTING); /* Currently only used in
|
|
commit */
|
|
memo = &(mtr->memo);
|
|
|
|
offset = dyn_array_get_data_size(memo);
|
|
|
|
while (offset > 0) {
|
|
offset -= sizeof(mtr_memo_slot_t);
|
|
slot = dyn_array_get_element(memo, offset);
|
|
|
|
mtr_memo_slot_release(mtr, slot);
|
|
}
|
|
}
|
|
|
|
/************************************************************//**
|
|
Writes the contents of a mini-transaction log, if any, to the database log. */
|
|
static
|
|
void
|
|
mtr_log_reserve_and_write(
|
|
/*======================*/
|
|
mtr_t* mtr) /*!< in: mtr */
|
|
{
|
|
dyn_array_t* mlog;
|
|
dyn_block_t* block;
|
|
ulint data_size;
|
|
byte* first_data;
|
|
|
|
ut_ad(mtr);
|
|
|
|
mlog = &(mtr->log);
|
|
|
|
first_data = dyn_block_get_data(mlog);
|
|
|
|
if (mtr->n_log_recs > 1) {
|
|
mlog_catenate_ulint(mtr, MLOG_MULTI_REC_END, MLOG_1BYTE);
|
|
} else {
|
|
*first_data = (byte)((ulint)*first_data
|
|
| MLOG_SINGLE_REC_FLAG);
|
|
}
|
|
|
|
if (mlog->heap == NULL) {
|
|
mtr->end_lsn = log_reserve_and_write_fast(
|
|
first_data, dyn_block_get_used(mlog),
|
|
&mtr->start_lsn);
|
|
if (mtr->end_lsn) {
|
|
|
|
return;
|
|
}
|
|
}
|
|
|
|
data_size = dyn_array_get_data_size(mlog);
|
|
|
|
/* Open the database log for log_write_low */
|
|
mtr->start_lsn = log_reserve_and_open(data_size);
|
|
|
|
if (mtr->log_mode == MTR_LOG_ALL) {
|
|
|
|
block = mlog;
|
|
|
|
while (block != NULL) {
|
|
log_write_low(dyn_block_get_data(block),
|
|
dyn_block_get_used(block));
|
|
block = dyn_array_get_next_block(mlog, block);
|
|
}
|
|
} else {
|
|
ut_ad(mtr->log_mode == MTR_LOG_NONE);
|
|
/* Do nothing */
|
|
}
|
|
|
|
mtr->end_lsn = log_close();
|
|
}
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
/***************************************************************//**
|
|
Commits a mini-transaction. */
|
|
UNIV_INTERN
|
|
void
|
|
mtr_commit(
|
|
/*=======*/
|
|
mtr_t* mtr) /*!< in: mini-transaction */
|
|
{
|
|
#ifndef UNIV_HOTBACKUP
|
|
ibool write_log;
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
ut_ad(mtr);
|
|
ut_ad(mtr->magic_n == MTR_MAGIC_N);
|
|
ut_ad(mtr->state == MTR_ACTIVE);
|
|
ut_d(mtr->state = MTR_COMMITTING);
|
|
|
|
#ifndef UNIV_HOTBACKUP
|
|
/* This is a dirty read, for debugging. */
|
|
ut_ad(!recv_no_log_write);
|
|
write_log = mtr->modifications && mtr->n_log_recs;
|
|
|
|
if (write_log) {
|
|
mtr_log_reserve_and_write(mtr);
|
|
}
|
|
|
|
/* We first update the modification info to buffer pages, and only
|
|
after that release the log mutex: this guarantees that when the log
|
|
mutex is free, all buffer pages contain an up-to-date info of their
|
|
modifications. This fact is used in making a checkpoint when we look
|
|
at the oldest modification of any page in the buffer pool. It is also
|
|
required when we insert modified buffer pages in to the flush list
|
|
which must be sorted on oldest_modification. */
|
|
|
|
mtr_memo_pop_all(mtr);
|
|
|
|
if (write_log) {
|
|
log_release();
|
|
}
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
ut_d(mtr->state = MTR_COMMITTED);
|
|
dyn_array_free(&(mtr->memo));
|
|
dyn_array_free(&(mtr->log));
|
|
}
|
|
|
|
#ifndef UNIV_HOTBACKUP
|
|
/**********************************************************//**
|
|
Releases the latches stored in an mtr memo down to a savepoint.
|
|
NOTE! The mtr must not have made changes to buffer pages after the
|
|
savepoint, as these can be handled only by mtr_commit. */
|
|
UNIV_INTERN
|
|
void
|
|
mtr_rollback_to_savepoint(
|
|
/*======================*/
|
|
mtr_t* mtr, /*!< in: mtr */
|
|
ulint savepoint) /*!< in: savepoint */
|
|
{
|
|
mtr_memo_slot_t* slot;
|
|
dyn_array_t* memo;
|
|
ulint offset;
|
|
|
|
ut_ad(mtr);
|
|
ut_ad(mtr->magic_n == MTR_MAGIC_N);
|
|
ut_ad(mtr->state == MTR_ACTIVE);
|
|
|
|
memo = &(mtr->memo);
|
|
|
|
offset = dyn_array_get_data_size(memo);
|
|
ut_ad(offset >= savepoint);
|
|
|
|
while (offset > savepoint) {
|
|
offset -= sizeof(mtr_memo_slot_t);
|
|
|
|
slot = dyn_array_get_element(memo, offset);
|
|
|
|
ut_ad(slot->type != MTR_MEMO_MODIFY);
|
|
mtr_memo_slot_release(mtr, slot);
|
|
}
|
|
}
|
|
|
|
/***************************************************//**
|
|
Releases an object in the memo stack. */
|
|
UNIV_INTERN
|
|
void
|
|
mtr_memo_release(
|
|
/*=============*/
|
|
mtr_t* mtr, /*!< in: mtr */
|
|
void* object, /*!< in: object */
|
|
ulint type) /*!< in: object type: MTR_MEMO_S_LOCK, ... */
|
|
{
|
|
mtr_memo_slot_t* slot;
|
|
dyn_array_t* memo;
|
|
ulint offset;
|
|
|
|
ut_ad(mtr);
|
|
ut_ad(mtr->magic_n == MTR_MAGIC_N);
|
|
ut_ad(mtr->state == MTR_ACTIVE);
|
|
|
|
memo = &(mtr->memo);
|
|
|
|
offset = dyn_array_get_data_size(memo);
|
|
|
|
while (offset > 0) {
|
|
offset -= sizeof(mtr_memo_slot_t);
|
|
|
|
slot = dyn_array_get_element(memo, offset);
|
|
|
|
if ((object == slot->object) && (type == slot->type)) {
|
|
|
|
mtr_memo_slot_release(mtr, slot);
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
/********************************************************//**
|
|
Reads 1 - 4 bytes from a file page buffered in the buffer pool.
|
|
@return value read */
|
|
UNIV_INTERN
|
|
ulint
|
|
mtr_read_ulint(
|
|
/*===========*/
|
|
const byte* ptr, /*!< in: pointer from where to read */
|
|
ulint type, /*!< in: MLOG_1BYTE, MLOG_2BYTES, MLOG_4BYTES */
|
|
mtr_t* mtr __attribute__((unused)))
|
|
/*!< in: mini-transaction handle */
|
|
{
|
|
ut_ad(mtr->state == MTR_ACTIVE);
|
|
ut_ad(mtr_memo_contains_page(mtr, ptr, MTR_MEMO_PAGE_S_FIX)
|
|
|| mtr_memo_contains_page(mtr, ptr, MTR_MEMO_PAGE_X_FIX));
|
|
if (type == MLOG_1BYTE) {
|
|
return(mach_read_from_1(ptr));
|
|
} else if (type == MLOG_2BYTES) {
|
|
return(mach_read_from_2(ptr));
|
|
} else {
|
|
ut_ad(type == MLOG_4BYTES);
|
|
return(mach_read_from_4(ptr));
|
|
}
|
|
}
|
|
|
|
/********************************************************//**
|
|
Reads 8 bytes from a file page buffered in the buffer pool.
|
|
@return value read */
|
|
UNIV_INTERN
|
|
dulint
|
|
mtr_read_dulint(
|
|
/*============*/
|
|
const byte* ptr, /*!< in: pointer from where to read */
|
|
mtr_t* mtr __attribute__((unused)))
|
|
/*!< in: mini-transaction handle */
|
|
{
|
|
ut_ad(mtr->state == MTR_ACTIVE);
|
|
ut_ad(mtr_memo_contains_page(mtr, ptr, MTR_MEMO_PAGE_S_FIX)
|
|
|| mtr_memo_contains_page(mtr, ptr, MTR_MEMO_PAGE_X_FIX));
|
|
return(mach_read_from_8(ptr));
|
|
}
|
|
|
|
#ifdef UNIV_DEBUG
|
|
# ifndef UNIV_HOTBACKUP
|
|
/**********************************************************//**
|
|
Checks if memo contains the given page.
|
|
@return TRUE if contains */
|
|
UNIV_INTERN
|
|
ibool
|
|
mtr_memo_contains_page(
|
|
/*===================*/
|
|
mtr_t* mtr, /*!< in: mtr */
|
|
const byte* ptr, /*!< in: pointer to buffer frame */
|
|
ulint type) /*!< in: type of object */
|
|
{
|
|
return(mtr_memo_contains(mtr, buf_block_align(ptr), type));
|
|
}
|
|
|
|
/*********************************************************//**
|
|
Prints info of an mtr handle. */
|
|
UNIV_INTERN
|
|
void
|
|
mtr_print(
|
|
/*======*/
|
|
mtr_t* mtr) /*!< in: mtr */
|
|
{
|
|
fprintf(stderr,
|
|
"Mini-transaction handle: memo size %lu bytes"
|
|
" log size %lu bytes\n",
|
|
(ulong) dyn_array_get_data_size(&(mtr->memo)),
|
|
(ulong) dyn_array_get_data_size(&(mtr->log)));
|
|
}
|
|
# endif /* !UNIV_HOTBACKUP */
|
|
#endif /* UNIV_DEBUG */
|