Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
Browse Source

branches/zip: Add some const qualifiers to input parameters. 

rec_get_converted_size_comp(), rec_convert_dtuple_to_rec_comp(),
rec_convert_dtuple_to_rec_new(), rec_convert_dtuple_to_rec(): Add a
const qualifier to dict_index_t*.

row_search_on_row_ref(): Add const qualifiers to the dict_table_t*
and dtuple_t* parameters.  Note that pcur is an "out" parameter
and mtr is "in/out".
pull/73/head
marko 18 years ago
parent
1db629ed69
commit
ff9f1a140b
4 changed files with 72 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      include/rem0rec.h
  2. 14
      include/row0row.h
  3. 59
      rem/rem0rec.c
  4. 14
      row/row0row.c

48
include/rem0rec.h
View File

@ -620,14 +620,15 @@ Builds a ROW_FORMAT=COMPACT record out of a data tuple. */
void
rec_convert_dtuple_to_rec_comp(
/*===========================*/
rec_t* rec, /* in: origin of record */
ulint extra, /* in: number of bytes to reserve between
the record header and the data payload
(usually REC_N_NEW_EXTRA_BYTES) */
dict_index_t* index, /* in: record descriptor */
ulint status, /* in: status bits of the record */
const dfield_t* fields, /* in: array of data fields */
ulint n_fields);/* in: number of data fields */
rec_t* rec, /* in: origin of record */
ulint extra, /* in: number of bytes to
reserve between the record
header and the data payload
(normally REC_N_NEW_EXTRA_BYTES) */
const dict_index_t* index, /* in: record descriptor */
ulint status, /* in: status bits of the record */
const dfield_t* fields, /* in: array of data fields */
ulint n_fields);/* in: number of data fields */
/*************************************************************
Builds a physical record out of a data tuple and
stores it into the given buffer. */
@ -635,13 +636,14 @@ stores it into the given buffer. */
rec_t*
rec_convert_dtuple_to_rec(
/*======================*/
/* out: pointer to the origin
of physical record */
byte* buf, /* in: start address of the
physical record */
dict_index_t* index, /* in: record descriptor */
const dtuple_t* dtuple, /* in: data tuple */
ulint n_ext); /* in: number of externally stored columns */
/* out: pointer to the origin
of physical record */
byte* buf, /* in: start address of the
physical record */
const dict_index_t* index, /* in: record descriptor */
const dtuple_t* dtuple, /* in: data tuple */
ulint n_ext); /* in: number of
externally stored columns */
/**************************************************************
Returns the extra size of an old-style physical record if we know its
data size and number of fields. */
@ -660,13 +662,15 @@ Determines the size of a data tuple in ROW_FORMAT=COMPACT. */
ulint
rec_get_converted_size_comp(
/*========================*/
/* out: size */
dict_index_t* index, /* in: record descriptor;
dict_table_is_comp() is assumed to hold */
ulint status, /* in: status bits of the record */
const dfield_t* fields, /* in: array of data fields */
ulint n_fields,/* in: number of data fields */
ulint* extra); /* out: extra size */
/* out: total size */
const dict_index_t* index, /* in: record descriptor;
dict_table_is_comp() is
assumed to hold, even if
it does not */
ulint status, /* in: status bits of the record */
const dfield_t* fields, /* in: array of data fields */
ulint n_fields,/* in: number of data fields */
ulint* extra); /* out: extra size */
/**************************************************************
The following function returns the size of a data tuple when converted to
a physical record. */

14
include/row0row.h
View File

@ -217,13 +217,13 @@ reference. */
ibool
row_search_on_row_ref(
/*==================*/
/* out: TRUE if found */
btr_pcur_t* pcur, /* in/out: persistent cursor, which must
be closed by the caller */
ulint mode, /* in: BTR_MODIFY_LEAF, ... */
dict_table_t* table, /* in: table */
dtuple_t* ref, /* in: row reference */
mtr_t* mtr); /* in: mtr */
/* out: TRUE if found */
btr_pcur_t* pcur, /* out: persistent cursor, which must
be closed by the caller */
ulint mode, /* in: BTR_MODIFY_LEAF, ... */
const dict_table_t* table, /* in: table */
const dtuple_t* ref, /* in: row reference */
mtr_t* mtr); /* in/out: mtr */
/*************************************************************************
Fetches the clustered index record for a secondary index record. The latches
on the secondary index record are preserved. */

59
rem/rem0rec.c
View File

@ -732,13 +732,15 @@ Determines the size of a data tuple in ROW_FORMAT=COMPACT. */
ulint
rec_get_converted_size_comp(
/*========================*/
/* out: total size */
dict_index_t* index, /* in: record descriptor;
dict_table_is_comp() is assumed to hold */
ulint status, /* in: status bits of the record */
const dfield_t* fields, /* in: array of data fields */
ulint n_fields,/* in: number of data fields */
ulint* extra) /* out: extra size */
/* out: total size */
const dict_index_t* index, /* in: record descriptor;
dict_table_is_comp() is
assumed to hold, even if
it does not */
ulint status, /* in: status bits of the record */
const dfield_t* fields, /* in: array of data fields */
ulint n_fields,/* in: number of data fields */
ulint* extra) /* out: extra size */
{
ulint extra_size;
ulint data_size;
@ -1000,14 +1002,15 @@ Builds a ROW_FORMAT=COMPACT record out of a data tuple. */
void
rec_convert_dtuple_to_rec_comp(
/*===========================*/
rec_t* rec, /* in: origin of record */
ulint extra, /* in: number of bytes to reserve between
the record header and the data payload
(normally REC_N_NEW_EXTRA_BYTES) */
dict_index_t* index, /* in: record descriptor */
ulint status, /* in: status bits of the record */
const dfield_t* fields, /* in: array of data fields */
ulint n_fields)/* in: number of data fields */
rec_t* rec, /* in: origin of record */
ulint extra, /* in: number of bytes to
reserve between the record
header and the data payload
(normally REC_N_NEW_EXTRA_BYTES) */
const dict_index_t* index, /* in: record descriptor */
ulint status, /* in: status bits of the record */
const dfield_t* fields, /* in: array of data fields */
ulint n_fields)/* in: number of data fields */
{
const dfield_t* field;
const dtype_t* type;
@ -1120,11 +1123,12 @@ static
rec_t*
rec_convert_dtuple_to_rec_new(
/*==========================*/
/* out: pointer to the origin
of physical record */
byte* buf, /* in: start address of the physical record */
dict_index_t* index, /* in: record descriptor */
const dtuple_t* dtuple) /* in: data tuple */
/* out: pointer to the origin
of physical record */
byte* buf, /* in: start address of
the physical record */
const dict_index_t* index, /* in: record descriptor */
const dtuple_t* dtuple) /* in: data tuple */
{
ulint extra_size;
ulint status;
@ -1153,13 +1157,14 @@ stores it beginning from the start of the given buffer. */
rec_t*
rec_convert_dtuple_to_rec(
/*======================*/
/* out: pointer to the origin
of physical record */
byte* buf, /* in: start address of the
physical record */
dict_index_t* index, /* in: record descriptor */
const dtuple_t* dtuple, /* in: data tuple */
ulint n_ext) /* in: number of externally stored columns */
/* out: pointer to the origin
of physical record */
byte* buf, /* in: start address of the
physical record */
const dict_index_t* index, /* in: record descriptor */
const dtuple_t* dtuple, /* in: data tuple */
ulint n_ext) /* in: number of
externally stored columns */
{
rec_t* rec;

14
row/row0row.c
View File

@ -646,13 +646,13 @@ Searches the clustered index record for a row, if we have the row reference. */
ibool
row_search_on_row_ref(
/*==================*/
/* out: TRUE if found */
btr_pcur_t* pcur, /* in/out: persistent cursor, which must
be closed by the caller */
ulint mode, /* in: BTR_MODIFY_LEAF, ... */
dict_table_t* table, /* in: table */
dtuple_t* ref, /* in: row reference */
mtr_t* mtr) /* in: mtr */
/* out: TRUE if found */
btr_pcur_t* pcur, /* out: persistent cursor, which must
be closed by the caller */
ulint mode, /* in: BTR_MODIFY_LEAF, ... */
const dict_table_t* table, /* in: table */
const dtuple_t* ref, /* in: row reference */
mtr_t* mtr) /* in/out: mtr */
{
ulint low_match;
rec_t* rec;

Write Preview
Loading…
Cancel
Save