mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
8f39541e7d
Added logging and pinning of pages to block format. Integration of transaction manager, log handler. Better page cache intergration Split trnman.h into two files, so that we don't have to include my_atomic.h into C++ programs. Renaming of structures, more comments, more debugging etc. Fixed problem with small head block + long varchar. Added extra argument to delete_record() and update_record() (needed for UNDO logging) Small changes to interface of pagecache and log handler. Change initialization of log_record_type_descriptors to not be depending on enum order. Use array of LEX_STRING's to send data to log handler Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists. include/lf.h: Interface fixes Rename of structures (Patch from Sergei via Sanja) include/my_atomic.h: More comments include/my_global.h: Added MY_ERRPTR include/pagecache.h: Added undo LSN when unlocking pages mysql-test/r/maria.result: Updated results mysql-test/t/maria.test: Added autocommit around lock tables (Patch from Sanja) mysys/lf_alloc-pin.c: Post-review fixes, simple optimizations More comments Struct slot renames Check amount of memory on stack (Patch from Sergei) mysys/lf_dynarray.c: More comments mysys/lf_hash.c: More comments After review fixes (Patch from Sergei) storage/maria/ha_maria.cc: Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program. (Temporary fix to avoid bug in gcc) Move out all deferencing of the transaction structure. Transaction manager integrated (Patch from Sergei) storage/maria/ha_maria.h: Added prototype for start_stmt() storage/maria/lockman.c: Function call rename storage/maria/ma_bitmap.c: Mark deleted pages free from page cache storage/maria/ma_blockrec.c: Offset -> rownr More debugging Fixed problem with small head block + long varchar Added logging of changed pages Added logging of undo (Including only loggging of changed fields in case of update) Added pinning/unpinning of all changed pages More comments Added free_full_pages() as the same code was used in several places. fill_rows_parts() renamed as fill_insert_undo_parts() offset -> rownr Added some optimization of not transactional tables _ma_update_block_record() has new parameter, as we need original row to do efficent undo for update storage/maria/ma_blockrec.h: Added ROW_EXTENTS_ON_STACK Changed prototype for update and delete of row storage/maria/ma_check.c: Added original row to delete_record() call storage/maria/ma_control_file.h: Added ifdefs for C++ storage/maria/ma_delete.c: Added original row to delete_record() call (Needed for efficent undo logging) storage/maria/ma_dynrec.c: Added extra argument to delete_record() and update_record() Removed not used variable storage/maria/ma_init.c: Initialize log handler storage/maria/ma_loghandler.c: Removed not used variable Change initialization of log_record_type_descriptors to not be depending on enum order Use array of LEX_STRING's to send data to log handler storage/maria/ma_loghandler.h: New defines Use array of LEX_STRING's to send data to log handler storage/maria/ma_open.c: Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists. Store in MARIA_SHARE->page_type if pages will have up to date LSN's storage/maria/ma_pagecache.c: Don't decrease number of readers when using pagecache_write()/pagecache_read() In pagecache_write() decrement request count if page was left pinned Added pagecache_delete_pages() Removed some casts Make trace output consistent with rest of code Simplify calling of DBUG_ASSERT(0) Only update LSN if the LSN is bigger than what's already on the page Added LSN parameter pagecache_unpin_page(), pagecache_unpin(), and pagecache_unlock() (Part of patch from Sanja) storage/maria/ma_static.c: Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists. Added default page cache storage/maria/ma_statrec.c: Added extra argument to delete_record() and update_record() storage/maria/ma_test1.c: Added option -T for transactions storage/maria/ma_test2.c: Added option -T for transactions storage/maria/ma_test_all.sh: Test with transactions storage/maria/ma_update.c: Changed prototype for update of row storage/maria/maria_def.h: Changed prototype for update & delete of row as block records need to access the old row Store in MARIA_SHARE->page_type if pages will have up to date LSN's Added MARIA_MAX_TREE_LEVELS to allow us to calculate the number of possible pinned pages we may need. Removed not used 'empty_bits_buffer' Added pointer to transaction object Added array for pinned pages Added log_row_parts array for logging of field data. Added MARIA_PINNED_PAGE to store pinned pages storage/maria/trnman.c: Added accessor functions to transaction object Added missing DBUG_RETURN() More debugging More comments Changed // comment of code to #ifdef NOT_USED Transaction manager integrated. Post review fixes Part of patch originally from Sergei storage/maria/trnman.h: Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program. (Temporary fix to avoid bug in gcc) storage/maria/unittest/ma_pagecache_single.c: Added missing argument Added SKIP_BIG_TESTS (Patch from Sanja) storage/maria/unittest/ma_test_loghandler-t.c: Test logging with new LEX_STRING parameter (Patch from Sanja) storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Test logging with new LEX_STRING parameter (Patch from Sanja) storage/maria/unittest/ma_test_loghandler_multithread-t.c: Test logging with new LEX_STRING parameter (Patch from Sanja) storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Test logging with new LEX_STRING parameter (Patch from Sanja) storage/maria/unittest/trnman-t.c: Stack overflow detection (Patch from Sergei) unittest/unit.pl: Command-line options --big and --verbose (Patch from Sergei) unittest/mytap/tap.c: Detect --big (Patch from Sergei) unittest/mytap/tap.h: Skip_big_tests and SKIP_BIG_TESTS (Patch from Sergei) storage/maria/trnman_public.h: New BitKeeper file ``storage/maria/trnman_public.h''
242 lines
7.6 KiB
C
242 lines
7.6 KiB
C
/* Copyright (C) 2006 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 */
|
|
|
|
/*
|
|
This header defines five atomic operations:
|
|
|
|
my_atomic_add#(&var, what)
|
|
add 'what' to *var, and return the old value of *var
|
|
|
|
my_atomic_fas#(&var, what)
|
|
'Fetch And Store'
|
|
store 'what' in *var, and return the old value of *var
|
|
|
|
my_atomic_cas#(&var, &old, new)
|
|
'Compare And Swap'
|
|
if *var is equal to *old, then store 'new' in *var, and return TRUE
|
|
otherwise store *var in *old, and return FALSE
|
|
|
|
my_atomic_load#(&var)
|
|
return *var
|
|
|
|
my_atomic_store#(&var, what)
|
|
store 'what' in *var
|
|
|
|
'#' is substituted by a size suffix - 8, 16, 32, or ptr
|
|
(e.g. my_atomic_add8, my_atomic_fas32, my_atomic_casptr).
|
|
|
|
NOTE This operations are not always atomic, so they always must be
|
|
enclosed in my_atomic_rwlock_rdlock(lock)/my_atomic_rwlock_rdunlock(lock)
|
|
or my_atomic_rwlock_wrlock(lock)/my_atomic_rwlock_wrunlock(lock).
|
|
Hint: if a code block makes intensive use of atomic ops, it make sense
|
|
to take/release rwlock once for the whole block, not for every statement.
|
|
|
|
On architectures where these operations are really atomic, rwlocks will
|
|
be optimized away.
|
|
*/
|
|
|
|
#ifndef my_atomic_rwlock_init
|
|
|
|
#define intptr void *
|
|
|
|
#ifndef MY_ATOMIC_MODE_RWLOCKS
|
|
#include "atomic/nolock.h"
|
|
#endif
|
|
|
|
#ifndef make_atomic_cas_body
|
|
#include "atomic/rwlock.h"
|
|
#endif
|
|
|
|
#ifndef make_atomic_add_body
|
|
#define make_atomic_add_body(S) \
|
|
int ## S tmp=*a; \
|
|
while (!my_atomic_cas ## S(a, &tmp, tmp+v)); \
|
|
v=tmp;
|
|
#endif
|
|
|
|
#ifdef __GNUC__
|
|
/*
|
|
we want to be able to use my_atomic_xxx functions with
|
|
both signed and unsigned integers. But gcc will issue a warning
|
|
"passing arg N of `my_atomic_XXX' as [un]signed due to prototype"
|
|
if the signedness of the argument doesn't match the prototype, or
|
|
"pointer targets in passing argument N of my_atomic_XXX differ in signedness"
|
|
if int* is used where uint* is expected (or vice versa).
|
|
Let's shut these warnings up
|
|
*/
|
|
#define make_transparent_unions(S) \
|
|
typedef union { \
|
|
int ## S i; \
|
|
uint ## S u; \
|
|
} U_ ## S __attribute__ ((transparent_union)); \
|
|
typedef union { \
|
|
int ## S volatile *i; \
|
|
uint ## S volatile *u; \
|
|
} Uv_ ## S __attribute__ ((transparent_union));
|
|
#define uintptr intptr
|
|
make_transparent_unions(8)
|
|
make_transparent_unions(16)
|
|
make_transparent_unions(32)
|
|
make_transparent_unions(ptr)
|
|
#undef uintptr
|
|
#undef make_transparent_unions
|
|
#define a U_a.i
|
|
#define cmp U_cmp.i
|
|
#define v U_v.i
|
|
#define set U_set.i
|
|
#else
|
|
#define U_8 int8
|
|
#define U_16 int16
|
|
#define U_32 int32
|
|
#define U_ptr intptr
|
|
#define Uv_8 int8
|
|
#define Uv_16 int16
|
|
#define Uv_32 int32
|
|
#define Uv_ptr intptr
|
|
#define U_a volatile *a
|
|
#define U_cmp *cmp
|
|
#define U_v v
|
|
#define U_set set
|
|
#endif /* __GCC__ transparent_union magic */
|
|
|
|
#ifdef HAVE_INLINE
|
|
|
|
#define make_atomic_add(S) \
|
|
STATIC_INLINE int ## S my_atomic_add ## S( \
|
|
Uv_ ## S U_a, U_ ## S U_v) \
|
|
{ \
|
|
make_atomic_add_body(S); \
|
|
return v; \
|
|
}
|
|
|
|
#define make_atomic_fas(S) \
|
|
STATIC_INLINE int ## S my_atomic_fas ## S( \
|
|
Uv_ ## S U_a, U_ ## S U_v) \
|
|
{ \
|
|
make_atomic_fas_body(S); \
|
|
return v; \
|
|
}
|
|
|
|
#define make_atomic_cas(S) \
|
|
STATIC_INLINE int my_atomic_cas ## S(Uv_ ## S U_a, \
|
|
Uv_ ## S U_cmp, U_ ## S U_set) \
|
|
{ \
|
|
int8 ret; \
|
|
make_atomic_cas_body(S); \
|
|
return ret; \
|
|
}
|
|
|
|
#define make_atomic_load(S) \
|
|
STATIC_INLINE int ## S my_atomic_load ## S(Uv_ ## S U_a) \
|
|
{ \
|
|
int ## S ret; \
|
|
make_atomic_load_body(S); \
|
|
return ret; \
|
|
}
|
|
|
|
#define make_atomic_store(S) \
|
|
STATIC_INLINE void my_atomic_store ## S( \
|
|
Uv_ ## S U_a, U_ ## S U_v) \
|
|
{ \
|
|
make_atomic_store_body(S); \
|
|
}
|
|
|
|
#else /* no inline functions */
|
|
|
|
#define make_atomic_add(S) \
|
|
extern int ## S my_atomic_add ## S(Uv_ ## S, U_ ## S);
|
|
|
|
#define make_atomic_fas(S) \
|
|
extern int ## S my_atomic_fas ## S(Uv_ ## S, U_ ## S);
|
|
|
|
#define make_atomic_cas(S) \
|
|
extern int my_atomic_cas ## S(Uv_ ## S, Uv_ ## S, U_ ## S);
|
|
|
|
#define make_atomic_load(S) \
|
|
extern int ## S my_atomic_load ## S(Uv_ ## S);
|
|
|
|
#define make_atomic_store(S) \
|
|
extern void my_atomic_store ## S(Uv_ ## S, U_ ## S);
|
|
|
|
#endif
|
|
|
|
make_atomic_cas( 8)
|
|
make_atomic_cas(16)
|
|
make_atomic_cas(32)
|
|
make_atomic_cas(ptr)
|
|
|
|
make_atomic_add( 8)
|
|
make_atomic_add(16)
|
|
make_atomic_add(32)
|
|
|
|
make_atomic_load( 8)
|
|
make_atomic_load(16)
|
|
make_atomic_load(32)
|
|
make_atomic_load(ptr)
|
|
|
|
make_atomic_store( 8)
|
|
make_atomic_store(16)
|
|
make_atomic_store(32)
|
|
make_atomic_store(ptr)
|
|
|
|
make_atomic_fas( 8)
|
|
make_atomic_fas(16)
|
|
make_atomic_fas(32)
|
|
make_atomic_fas(ptr)
|
|
|
|
#ifdef _atomic_h_cleanup_
|
|
#include _atomic_h_cleanup_
|
|
#undef _atomic_h_cleanup_
|
|
#endif
|
|
|
|
#undef U_8
|
|
#undef U_16
|
|
#undef U_32
|
|
#undef U_ptr
|
|
#undef a
|
|
#undef cmp
|
|
#undef v
|
|
#undef set
|
|
#undef U_a
|
|
#undef U_cmp
|
|
#undef U_v
|
|
#undef U_set
|
|
#undef make_atomic_add
|
|
#undef make_atomic_cas
|
|
#undef make_atomic_load
|
|
#undef make_atomic_store
|
|
#undef make_atomic_fas
|
|
#undef make_atomic_add_body
|
|
#undef make_atomic_cas_body
|
|
#undef make_atomic_load_body
|
|
#undef make_atomic_store_body
|
|
#undef make_atomic_fas_body
|
|
#undef intptr
|
|
|
|
/*
|
|
the macro below defines (as an expression) the code that
|
|
will be run in spin-loops. Intel manuals recummend to have PAUSE there.
|
|
It is expected to be defined in include/atomic/ *.h files
|
|
*/
|
|
#ifndef LF_BACKOFF
|
|
#define LF_BACKOFF (1)
|
|
#endif
|
|
|
|
#define MY_ATOMIC_OK 0
|
|
#define MY_ATOMIC_NOT_1CPU 1
|
|
extern int my_atomic_initialize();
|
|
|
|
#endif
|
|
|