mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: Fix terminology that was introduced in r2569:

Browse source 
replace rbmode and "rollback mode"
with rb_ctx and "rollback context".
Suggested by Sunny.
This commit is contained in:
marko 2008-08-06 08:59:28 +00:00
parent ba78ee0d47
commit 9fb4f7ab7c
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
btr/btr0cur.c
View file

@ -113,7 +113,7 @@ btr_rec_free_updated_extern_fields(
part will be updated, or NULL */ part will be updated, or NULL */
const ulint* offsets,/* in: rec_get_offsets(rec, index) */ const ulint* offsets,/* in: rec_get_offsets(rec, index) */
const upd_t* update, /* in: update vector */ const upd_t* update, /* in: update vector */
enum trx_rbmode rbmode, /* in: rollback mode */ enum trx_rb_ctx rb_ctx, /* in: rollback context */
mtr_t* mtr); /* in: mini-transaction handle which contains mtr_t* mtr); /* in: mini-transaction handle which contains
an X-latch to record page and to the tree */ an X-latch to record page and to the tree */
/*************************************************************** /***************************************************************
@ -128,7 +128,7 @@ btr_rec_free_externally_stored_fields(
const ulint* offsets,/* in: rec_get_offsets(rec, index) */ const ulint* offsets,/* in: rec_get_offsets(rec, index) */
page_zip_des_t* page_zip,/* in: compressed page whose uncompressed page_zip_des_t* page_zip,/* in: compressed page whose uncompressed
part will be updated, or NULL */ part will be updated, or NULL */
enum trx_rbmode rbmode, /* in: rollback mode */ enum trx_rb_ctx rb_ctx, /* in: rollback context */
mtr_t* mtr); /* in: mini-transaction handle which contains mtr_t* mtr); /* in: mini-transaction handle which contains
an X-latch to record page and to the index an X-latch to record page and to the index
tree */ tree */
@ -2812,7 +2812,7 @@ btr_cur_pessimistic_delete(
if compression does not occur, the cursor if compression does not occur, the cursor
stays valid: it points to successor of stays valid: it points to successor of
deleted record on function exit */ deleted record on function exit */
enum trx_rbmode rbmode, /* in: rollback mode */ enum trx_rb_ctx rb_ctx, /* in: rollback context */
mtr_t* mtr) /* in: mtr */ mtr_t* mtr) /* in: mtr */
{ {
buf_block_t* block; buf_block_t* block;
@ -2866,7 +2866,7 @@ btr_cur_pessimistic_delete(
if (rec_offs_any_extern(offsets)) { if (rec_offs_any_extern(offsets)) {
btr_rec_free_externally_stored_fields(index, btr_rec_free_externally_stored_fields(index,
rec, offsets, page_zip, rec, offsets, page_zip,
rbmode, mtr); rb_ctx, mtr);
#ifdef UNIV_ZIP_DEBUG #ifdef UNIV_ZIP_DEBUG
ut_a(!page_zip || page_zip_validate(page_zip, page)); ut_a(!page_zip || page_zip_validate(page_zip, page));
#endif /* UNIV_ZIP_DEBUG */ #endif /* UNIV_ZIP_DEBUG */
@ -4085,7 +4085,7 @@ btr_free_externally_stored_field(
to rec, or NULL if rec == NULL */ to rec, or NULL if rec == NULL */
ulint i, /* in: field number of field_ref; ulint i, /* in: field number of field_ref;
ignored if rec == NULL */ ignored if rec == NULL */
enum trx_rbmode rbmode, /* in: rollback mode */ enum trx_rb_ctx rb_ctx, /* in: rollback context */
mtr_t* local_mtr __attribute__((unused))) /* in: mtr mtr_t* local_mtr __attribute__((unused))) /* in: mtr
containing the latch to data an an containing the latch to data an an
X-latch to the index tree */ X-latch to the index tree */
@ -4120,7 +4120,7 @@ btr_free_externally_stored_field(
/* In the rollback of uncommitted transactions, we may /* In the rollback of uncommitted transactions, we may
encounter a clustered index record whose BLOBs have encounter a clustered index record whose BLOBs have
not been written. There is nothing to free then. */ not been written. There is nothing to free then. */
ut_a(rbmode == RB_RECOVERY); ut_a(rb_ctx == RB_RECOVERY);
return; return;
} }
@ -4168,7 +4168,7 @@ btr_free_externally_stored_field(
|| (mach_read_from_1(field_ref + BTR_EXTERN_LEN) || (mach_read_from_1(field_ref + BTR_EXTERN_LEN)
& BTR_EXTERN_OWNER_FLAG) & BTR_EXTERN_OWNER_FLAG)
/* Rollback and inherited field */ /* Rollback and inherited field */
|| (rbmode != RB_NONE || (rb_ctx != RB_NONE
&& (mach_read_from_1(field_ref + BTR_EXTERN_LEN) && (mach_read_from_1(field_ref + BTR_EXTERN_LEN)
& BTR_EXTERN_INHERITED_FLAG))) { & BTR_EXTERN_INHERITED_FLAG))) {
@ -4270,7 +4270,7 @@ btr_rec_free_externally_stored_fields(
const ulint* offsets,/* in: rec_get_offsets(rec, index) */ const ulint* offsets,/* in: rec_get_offsets(rec, index) */
page_zip_des_t* page_zip,/* in: compressed page whose uncompressed page_zip_des_t* page_zip,/* in: compressed page whose uncompressed
part will be updated, or NULL */ part will be updated, or NULL */
enum trx_rbmode rbmode, /* in: rollback mode */ enum trx_rb_ctx rb_ctx, /* in: rollback context */
mtr_t* mtr) /* in: mini-transaction handle which contains mtr_t* mtr) /* in: mini-transaction handle which contains
an X-latch to record page and to the index an X-latch to record page and to the index
tree */ tree */
@ -4294,7 +4294,7 @@ btr_rec_free_externally_stored_fields(
btr_free_externally_stored_field( btr_free_externally_stored_field(
index, data + len - BTR_EXTERN_FIELD_REF_SIZE, index, data + len - BTR_EXTERN_FIELD_REF_SIZE,
rec, offsets, page_zip, i, rbmode, mtr); rec, offsets, page_zip, i, rb_ctx, mtr);
} }
} }
} }
@ -4313,7 +4313,7 @@ btr_rec_free_updated_extern_fields(
part will be updated, or NULL */ part will be updated, or NULL */
const ulint* offsets,/* in: rec_get_offsets(rec, index) */ const ulint* offsets,/* in: rec_get_offsets(rec, index) */
const upd_t* update, /* in: update vector */ const upd_t* update, /* in: update vector */
enum trx_rbmode rbmode, /* in: rollback mode */ enum trx_rb_ctx rb_ctx, /* in: rollback context */
mtr_t* mtr) /* in: mini-transaction handle which contains mtr_t* mtr) /* in: mini-transaction handle which contains
an X-latch to record page and to the tree */ an X-latch to record page and to the tree */
{ {
@ -4339,7 +4339,7 @@ btr_rec_free_updated_extern_fields(
btr_free_externally_stored_field( btr_free_externally_stored_field(
index, data + len - BTR_EXTERN_FIELD_REF_SIZE, index, data + len - BTR_EXTERN_FIELD_REF_SIZE,
rec, offsets, page_zip, rec, offsets, page_zip,
ufield->field_no, rbmode, mtr); ufield->field_no, rb_ctx, mtr);
} }
} }
} }

4
include/btr0cur.h
View file

@ -379,7 +379,7 @@ btr_cur_pessimistic_delete(
if compression does not occur, the cursor if compression does not occur, the cursor
stays valid: it points to successor of stays valid: it points to successor of
deleted record on function exit */ deleted record on function exit */
enum trx_rbmode rbmode, /* in: rollback mode */ enum trx_rb_ctx rb_ctx, /* in: rollback context */
mtr_t* mtr); /* in: mtr */ mtr_t* mtr); /* in: mtr */
/*************************************************************** /***************************************************************
Parses a redo log record of updating a record in-place. */ Parses a redo log record of updating a record in-place. */
@ -521,7 +521,7 @@ btr_free_externally_stored_field(
to rec, or NULL if rec == NULL */ to rec, or NULL if rec == NULL */
ulint i, /* in: field number of field_ref; ulint i, /* in: field number of field_ref;
ignored if rec == NULL */ ignored if rec == NULL */
enum trx_rbmode rbmode, /* in: rollback mode */ enum trx_rb_ctx rb_ctx, /* in: rollback context */
mtr_t* local_mtr); /* in: mtr containing the latch to mtr_t* local_mtr); /* in: mtr containing the latch to
data an an X-latch to the index data an an X-latch to the index
tree */ tree */

4
include/trx0types.h
View file

@ -36,8 +36,8 @@ typedef struct roll_node_struct roll_node_t;
typedef struct commit_node_struct commit_node_t; typedef struct commit_node_struct commit_node_t;
typedef struct trx_named_savept_struct trx_named_savept_t; typedef struct trx_named_savept_struct trx_named_savept_t;
/* Rollback modes */ /* Rollback contexts */
enum trx_rbmode { enum trx_rb_ctx {
RB_NONE = 0, /* no rollback */ RB_NONE = 0, /* no rollback */
RB_NORMAL, /* normal rollback */ RB_NORMAL, /* normal rollback */
RB_RECOVERY, /* rolling back an incomplete transaction, RB_RECOVERY, /* rolling back an incomplete transaction,