mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
f094eff1d9
pointed data. I ran gcc -Wcast-qual on storage/maria, this identified un-needed casts, a couple of functions which said they had a const parameter though they changed the pointed content! This is fixed here. Some suspicious places receive a comment. The original intention of running -Wcast-qual was to find what code changes R-tree keys: I added const words, but hidden casts like those of int2store (casts target to (uint16*)) removed const checking; -Wcast-qual helped find those hidden casts. Log handler does not change the content pointed by LEX_STRING::str it receives, so we now use a struct which has a const inside, to emphasize this and be able to pass "const uchar*" buffers to log handler without fear of their content being changed by it. One-line fix for a merge glitch (when merging from MyISAM). include/m_string.h: As Maria's log handler uses LEX_STRING but never changes the content pointed by LEX_STRING::str, and assigns uchar* into this member most of the time, we introduce a new struct LEX_CUSTRING (C const U unsigned) for the log handler. include/my_global.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. include/my_handler.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. ha_find_null() does not change *a. include/my_sys.h: insert_dynamic() does not change *element. include/myisampack.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. mysys/array.c: insert_dynamic() does not change *element mysys/my_handler.c: ha_find_null() does not change *a storage/maria/ma_bitmap.c: Log handler receives const strings now storage/maria/ma_blockrec.c: Log handler receives const strings now. _ma_apply_undo_row_delete/update() do change *header. storage/maria/ma_blockrec.h: correct prototype storage/maria/ma_check.c: Log handler receives const strings now. Un-needed casts storage/maria/ma_checkpoint.c: Log handler receives const strings now storage/maria/ma_checksum.c: unneeded cast storage/maria/ma_commit.c: Log handler receives const strings now storage/maria/ma_create.c: Log handler receives const strings now storage/maria/ma_dbug.c: fixing warning of gcc -Wcast-qual storage/maria/ma_delete.c: Log handler receives const strings now storage/maria/ma_delete_all.c: Log handler receives const strings now storage/maria/ma_delete_table.c: Log handler receives const strings now storage/maria/ma_dynrec.c: fixing some warnings of gcc -Wcast-qual. Unneeded casts removed. Comment about function which lies. storage/maria/ma_ft_parser.c: fix for warnings of gcc -Wcast-qual, removing unneeded casts storage/maria/ma_ft_update.c: less casts, comment storage/maria/ma_key.c: less casts, stay const (warnings of gcc -Wcast-qual) storage/maria/ma_key_recover.c: Log handler receives const strings now storage/maria/ma_loghandler.c: Log handler receives const strings now storage/maria/ma_loghandler.h: Log handler receives const strings now storage/maria/ma_loghandler_lsn.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. storage/maria/ma_page.c: Log handler receives const strings now; more const storage/maria/ma_recovery.c: Log handler receives const strings now storage/maria/ma_rename.c: Log handler receives const strings now storage/maria/ma_rt_index.c: more const, to emphasize that functions don't change pointed content. best_key= NULL was forgotten during merge from MyISAM a few days ago, was causing a Valgrind warning storage/maria/ma_rt_index.h: new proto storage/maria/ma_rt_key.c: more const storage/maria/ma_rt_key.h: new proto storage/maria/ma_rt_mbr.c: more const for functions which deserve it storage/maria/ma_rt_mbr.h: new prototype storage/maria/ma_rt_split.c: make const what is not changed. storage/maria/ma_search.c: un-needed casts, more const storage/maria/ma_sp_key.c: more const storage/maria/ma_unique.c: un-needed casts. storage/maria/ma_write.c: Log handler receives const strings now storage/maria/maria_def.h: some more const storage/maria/unittest/ma_test_loghandler-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_first_lsn-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_multithread-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_noflush-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_nologs-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_purge-t.c: Log handler receives const strings now
118 lines
3.6 KiB
C
118 lines
3.6 KiB
C
/* Copyright (C) 2007 MySQL 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 */
|
|
|
|
#include "maria_def.h"
|
|
#include "trnman.h"
|
|
|
|
/**
|
|
@brief writes a COMMIT record to log and commits transaction in memory
|
|
|
|
@param trn transaction
|
|
|
|
@return Operation status
|
|
@retval 0 ok
|
|
@retval 1 error (disk error or out of memory)
|
|
*/
|
|
|
|
int ma_commit(TRN *trn)
|
|
{
|
|
int res;
|
|
LSN commit_lsn;
|
|
LEX_CUSTRING log_array[TRANSLOG_INTERNAL_PARTS];
|
|
DBUG_ENTER("ma_commit");
|
|
|
|
if (trn->undo_lsn == 0) /* no work done, rollback (cheaper than commit) */
|
|
DBUG_RETURN(trnman_rollback_trn(trn));
|
|
/*
|
|
- if COMMIT record is written before trnman_commit_trn():
|
|
if Checkpoint comes in the middle it will see trn is not committed,
|
|
then if crash, Recovery might roll back trn (if min(rec_lsn) is after
|
|
COMMIT record) and this is not an issue as
|
|
* transaction's updates were not made visible to other transactions
|
|
* "commit ok" was not sent to client
|
|
Alternatively, Recovery might commit trn (if min(rec_lsn) is before COMMIT
|
|
record), which is ok too. All in all it means that "trn committed" is not
|
|
100% equal to "COMMIT record written".
|
|
- if COMMIT record is written after trnman_commit_trn():
|
|
if crash happens between the two, trn will be rolled back which is an
|
|
issue (transaction's updates were made visible to other transactions).
|
|
So we need to go the first way.
|
|
*/
|
|
|
|
/*
|
|
We do not store "thd->transaction.xid_state.xid" for now, it will be
|
|
needed only when we support XA.
|
|
*/
|
|
res= (translog_write_record(&commit_lsn, LOGREC_COMMIT,
|
|
trn, NULL, 0,
|
|
sizeof(log_array)/sizeof(log_array[0]),
|
|
log_array, NULL, NULL) ||
|
|
translog_flush(commit_lsn) ||
|
|
trnman_commit_trn(trn));
|
|
/*
|
|
Note: if trnman_commit_trn() fails above, we have already
|
|
written the COMMIT record, so Checkpoint and Recovery will see the
|
|
transaction as committed.
|
|
*/
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
|
|
/**
|
|
@brief Writes a COMMIT record for a transaciton associated with a file
|
|
|
|
@param info Maria handler
|
|
|
|
@return Operation status
|
|
@retval 0 ok
|
|
@retval # error (disk error or out of memory)
|
|
*/
|
|
|
|
int maria_commit(MARIA_HA *info)
|
|
{
|
|
return info->s->now_transactional ? ma_commit(info->trn) : 0;
|
|
}
|
|
|
|
|
|
/**
|
|
@brief Starts a transaction on a file handle
|
|
|
|
@param info Maria handler
|
|
|
|
@return Operation status
|
|
@retval 0 ok
|
|
@retval # Error code.
|
|
*/
|
|
|
|
|
|
int maria_begin(MARIA_HA *info)
|
|
{
|
|
DBUG_ENTER("maria_begin");
|
|
|
|
if (info->s->now_transactional)
|
|
{
|
|
TRN *trn;
|
|
struct st_my_thread_var *mysys_var= my_thread_var;
|
|
trn= trnman_new_trn(&mysys_var->mutex,
|
|
&mysys_var->suspend,
|
|
(char*) &mysys_var + STACK_DIRECTION *1024*128);
|
|
if (unlikely(!trn))
|
|
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
|
|
|
DBUG_PRINT("info", ("TRN set to 0x%lx", (ulong) trn));
|
|
info->trn= trn;
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|