mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
branches/zip: page_zip_des_t: Enclose m_start in #ifdef UNIV_DEBUG.
Add m_nonempty for facilitating the test in page_zip_alloc(). This reduces the combined size of the bit-fields to 32 bits. Thus, sizeof(page_zip_des_t) == 2 machine words on 32-bit and wider systems.
This commit is contained in:
marko
parent
ea16688c66
commit
7b32620f7d
6 changed files with 60 additions and 26 deletions
|
|
@ -466,9 +466,12 @@ loop:
|
|||
|
||||
if (buf_block_get_zip_size(block) != zip_size) {
|
||||
page_zip_set_size(&block->page.zip, zip_size);
|
||||
block->page.zip.n_blobs = 0;
|
||||
block->page.zip.m_start = 0;
|
||||
block->page.zip.m_end = 0;
|
||||
#ifdef UNIV_DEBUG
|
||||
block->page.zip.m_start =
|
||||
#endif /* UNIV_DEBUG */
|
||||
block->page.zip.m_end =
|
||||
block->page.zip.m_nonempty =
|
||||
block->page.zip.n_blobs = 0;
|
||||
if (block->page.zip.data) {
|
||||
ut_free(block->page.zip.data);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2663,7 +2663,11 @@ error_exit2:
|
|||
page_zip_des_t page_zip;
|
||||
page_zip_set_size(&page_zip, zip_size);
|
||||
page_zip.data = page + UNIV_PAGE_SIZE;
|
||||
page_zip.n_blobs = page_zip.m_start = page_zip.m_end = 0;
|
||||
#ifdef UNIV_DEBUG
|
||||
page_zip.m_start =
|
||||
#endif /* UNIV_DEBUG */
|
||||
page_zip.m_end = page_zip.m_nonempty =
|
||||
page_zip.n_blobs = 0;
|
||||
buf_flush_init_for_writing(page, &page_zip, 0);
|
||||
ret = os_file_write(path, file, page_zip.data, 0, 0, zip_size);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,14 +32,17 @@ struct page_zip_des_struct
|
|||
{
|
||||
page_zip_t* data; /* compressed page data */
|
||||
|
||||
ulint :17; /* reserved */
|
||||
#ifdef UNIV_DEBUG
|
||||
ulint m_start:16; /* start offset of modification log */
|
||||
#endif /* UNIV_DEBUG */
|
||||
ulint m_end:16; /* end offset of modification log */
|
||||
ulint m_nonempty:1; /* TRUE if the modification log
|
||||
is not empty */
|
||||
ulint n_blobs:12; /* number of externally stored
|
||||
columns on the page; the maximum
|
||||
is 744 on a 16 KiB page */
|
||||
ulint ssize:3; /* 0 or compressed page size;
|
||||
the size in bytes is 512<<ssize. */
|
||||
ulint m_start:16; /* start offset of modification log */
|
||||
ulint m_end:16; /* end offset of modification log */
|
||||
};
|
||||
|
||||
#define PAGE_ZIP_MIN_SIZE 1024 /* smallest page_zip_des_struct.size */
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ page_zip_compress(
|
|||
/* out: TRUE on success, FALSE on failure;
|
||||
page_zip will be left intact on failure. */
|
||||
page_zip_des_t* page_zip,/* in: size; out: data, n_blobs,
|
||||
m_start, m_end */
|
||||
m_start, m_end, m_nonempty */
|
||||
const page_t* page, /* in: uncompressed page */
|
||||
dict_index_t* index, /* in: index of the B-tree node */
|
||||
mtr_t* mtr) /* in: mini-transaction, or NULL */
|
||||
|
|
@ -96,7 +96,7 @@ page_zip_decompress(
|
|||
/*================*/
|
||||
/* out: TRUE on success, FALSE on failure */
|
||||
page_zip_des_t* page_zip,/* in: data, size;
|
||||
out: m_start, m_end, n_blobs */
|
||||
out: m_start, m_end, m_nonempty, n_blobs */
|
||||
page_t* page) /* out: uncompressed page, may be trashed */
|
||||
__attribute__((warn_unused_result, nonnull));
|
||||
|
||||
|
|
@ -356,7 +356,8 @@ page_zip_reorganize(
|
|||
on failure. */
|
||||
buf_block_t* block, /* in/out: page with compressed page;
|
||||
on the compressed page, in: size;
|
||||
out: data, n_blobs, m_start, m_end */
|
||||
out: data, n_blobs,
|
||||
m_start, m_end, m_nonempty */
|
||||
dict_index_t* index, /* in: index of the B-tree node */
|
||||
mtr_t* mtr) /* in: mini-transaction */
|
||||
__attribute__((warn_unused_result, nonnull));
|
||||
|
|
@ -368,7 +369,7 @@ page_zip_copy(
|
|||
/*==========*/
|
||||
page_zip_des_t* page_zip, /* out: copy of src_zip
|
||||
(n_blobs, m_start, m_end,
|
||||
data[0..size-1]) */
|
||||
m_nonempty, data[0..size-1]) */
|
||||
page_t* page, /* out: copy of src */
|
||||
const page_zip_des_t* src_zip, /* in: compressed page */
|
||||
const page_t* src, /* in: page */
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ page_zip_alloc(
|
|||
return(TRUE);
|
||||
}
|
||||
|
||||
if (page_zip->m_start == page_zip->m_end) {
|
||||
if (!page_zip->m_nonempty) {
|
||||
/* The page has been freshly compressed, so
|
||||
recompressing it will not help. */
|
||||
return(FALSE);
|
||||
|
|
|
|||
|
|
@ -916,7 +916,7 @@ page_zip_compress(
|
|||
/* out: TRUE on success, FALSE on failure;
|
||||
page_zip will be left intact on failure. */
|
||||
page_zip_des_t* page_zip,/* in: size; out: data, n_blobs,
|
||||
m_start, m_end */
|
||||
m_start, m_end, m_nonempty */
|
||||
const page_t* page, /* in: uncompressed page */
|
||||
dict_index_t* index, /* in: index of the B-tree node */
|
||||
mtr_t* mtr) /* in: mini-transaction, or NULL */
|
||||
|
|
@ -1108,7 +1108,11 @@ zlib_error:
|
|||
included in avail_out. */
|
||||
memset(c_stream.next_out, 0, c_stream.avail_out + 1/* end marker */);
|
||||
|
||||
page_zip->m_end = page_zip->m_start = PAGE_DATA + c_stream.total_out;
|
||||
#ifdef UNIV_DEBUG
|
||||
page_zip->m_start =
|
||||
#endif /* UNIV_DEBUG */
|
||||
page_zip->m_end = PAGE_DATA + c_stream.total_out;
|
||||
page_zip->m_nonempty = FALSE;
|
||||
page_zip->n_blobs = n_blobs;
|
||||
/* Copy those header fields that will not be written
|
||||
in buf_flush_init_for_writing() */
|
||||
|
|
@ -1757,13 +1761,14 @@ zlib_done:
|
|||
- d_stream->next_out);
|
||||
}
|
||||
|
||||
#ifdef UNIV_DEBUG
|
||||
page_zip->m_start = PAGE_DATA + d_stream->total_in;
|
||||
#endif /* UNIV_DEBUG */
|
||||
|
||||
/* Apply the modification log. */
|
||||
{
|
||||
const byte* mod_log_ptr;
|
||||
mod_log_ptr = page_zip_apply_log(page_zip->data
|
||||
+ page_zip->m_start,
|
||||
mod_log_ptr = page_zip_apply_log(d_stream->next_in,
|
||||
d_stream->avail_in + 1,
|
||||
recs, n_dense,
|
||||
ULINT_UNDEFINED, heap_status,
|
||||
|
|
@ -1773,6 +1778,7 @@ zlib_done:
|
|||
return(FALSE);
|
||||
}
|
||||
page_zip->m_end = mod_log_ptr - page_zip->data;
|
||||
page_zip->m_nonempty = mod_log_ptr != d_stream->next_in;
|
||||
ut_a(page_zip_get_trailer_len(page_zip, index, NULL)
|
||||
+ page_zip->m_end < page_zip_get_size(page_zip));
|
||||
}
|
||||
|
|
@ -1892,13 +1898,14 @@ zlib_done:
|
|||
- d_stream->next_out);
|
||||
}
|
||||
|
||||
#ifdef UNIV_DEBUG
|
||||
page_zip->m_start = PAGE_DATA + d_stream->total_in;
|
||||
#endif /* UNIV_DEBUG */
|
||||
|
||||
/* Apply the modification log. */
|
||||
{
|
||||
const byte* mod_log_ptr;
|
||||
mod_log_ptr = page_zip_apply_log(page_zip->data
|
||||
+ page_zip->m_start,
|
||||
mod_log_ptr = page_zip_apply_log(d_stream->next_in,
|
||||
d_stream->avail_in + 1,
|
||||
recs, n_dense,
|
||||
ULINT_UNDEFINED, heap_status,
|
||||
|
|
@ -1908,6 +1915,7 @@ zlib_done:
|
|||
return(FALSE);
|
||||
}
|
||||
page_zip->m_end = mod_log_ptr - page_zip->data;
|
||||
page_zip->m_nonempty = mod_log_ptr != d_stream->next_in;
|
||||
ut_a(page_zip_get_trailer_len(page_zip, index, NULL)
|
||||
+ page_zip->m_end < page_zip_get_size(page_zip));
|
||||
}
|
||||
|
|
@ -2126,13 +2134,14 @@ zlib_done:
|
|||
- d_stream->next_out);
|
||||
}
|
||||
|
||||
#ifdef UNIV_DEBUG
|
||||
page_zip->m_start = PAGE_DATA + d_stream->total_in;
|
||||
#endif /* UNIV_DEBUG */
|
||||
|
||||
/* Apply the modification log. */
|
||||
{
|
||||
const byte* mod_log_ptr;
|
||||
mod_log_ptr = page_zip_apply_log(page_zip->data
|
||||
+ page_zip->m_start,
|
||||
mod_log_ptr = page_zip_apply_log(d_stream->next_in,
|
||||
d_stream->avail_in + 1,
|
||||
recs, n_dense,
|
||||
trx_id_col, heap_status,
|
||||
|
|
@ -2142,6 +2151,7 @@ zlib_done:
|
|||
return(FALSE);
|
||||
}
|
||||
page_zip->m_end = mod_log_ptr - page_zip->data;
|
||||
page_zip->m_nonempty = mod_log_ptr != d_stream->next_in;
|
||||
ut_a(page_zip_get_trailer_len(page_zip, index, NULL)
|
||||
+ page_zip->m_end < page_zip_get_size(page_zip));
|
||||
}
|
||||
|
|
@ -2215,7 +2225,7 @@ page_zip_decompress(
|
|||
/*================*/
|
||||
/* out: TRUE on success, FALSE on failure */
|
||||
page_zip_des_t* page_zip,/* in: data, size;
|
||||
out: m_start, m_end, n_blobs */
|
||||
out: m_start, m_end, m_nonempty, n_blobs */
|
||||
page_t* page) /* out: uncompressed page, may be trashed */
|
||||
{
|
||||
z_stream d_stream;
|
||||
|
|
@ -2421,18 +2431,26 @@ page_zip_validate(
|
|||
page_zip->n_blobs, temp_page_zip.n_blobs);
|
||||
valid = FALSE;
|
||||
}
|
||||
#ifdef UNIV_DEBUG
|
||||
if (page_zip->m_start != temp_page_zip.m_start) {
|
||||
fprintf(stderr,
|
||||
"page_zip_validate(): m_start mismatch: %d!=%d\n",
|
||||
page_zip->m_start, temp_page_zip.m_start);
|
||||
valid = FALSE;
|
||||
}
|
||||
#endif /* UNIV_DEBUG */
|
||||
if (page_zip->m_end != temp_page_zip.m_end) {
|
||||
fprintf(stderr,
|
||||
"page_zip_validate(): m_end mismatch: %d!=%d\n",
|
||||
page_zip->m_end, temp_page_zip.m_end);
|
||||
valid = FALSE;
|
||||
}
|
||||
if (page_zip->m_nonempty != temp_page_zip.m_nonempty) {
|
||||
fprintf(stderr,
|
||||
"page_zip_validate(): m_nonempty mismatch: %d!=%d\n",
|
||||
page_zip->m_nonempty, temp_page_zip.m_nonempty);
|
||||
valid = FALSE;
|
||||
}
|
||||
if (memcmp(page + PAGE_HEADER, temp_page + PAGE_HEADER,
|
||||
UNIV_PAGE_SIZE - PAGE_HEADER - FIL_PAGE_DATA_END)) {
|
||||
fputs("page_zip_validate(): content mismatch\n", stderr);
|
||||
|
|
@ -2702,6 +2720,7 @@ page_zip_write_rec(
|
|||
ut_a(!*data);
|
||||
ut_ad((ulint) (data - page_zip->data) < page_zip_get_size(page_zip));
|
||||
page_zip->m_end = data - page_zip->data;
|
||||
page_zip->m_nonempty = TRUE;
|
||||
|
||||
#ifdef UNIV_ZIP_DEBUG
|
||||
ut_a(page_zip_validate(page_zip, page_align((byte*) rec)));
|
||||
|
|
@ -3122,6 +3141,7 @@ page_zip_clear_rec(
|
|||
ut_ad((ulint) (data - page_zip->data)
|
||||
< page_zip_get_size(page_zip));
|
||||
page_zip->m_end = data - page_zip->data;
|
||||
page_zip->m_nonempty = TRUE;
|
||||
} else if (page_is_leaf(page) && dict_index_is_clust(index)) {
|
||||
/* Do not clear the record, because there is not enough space
|
||||
to log the operation. */
|
||||
|
|
@ -3516,7 +3536,8 @@ page_zip_reorganize(
|
|||
on failure. */
|
||||
buf_block_t* block, /* in/out: page with compressed page;
|
||||
on the compressed page, in: size;
|
||||
out: data, n_blobs, m_start, m_end */
|
||||
out: data, n_blobs,
|
||||
m_start, m_end, m_nonempty */
|
||||
dict_index_t* index, /* in: index of the B-tree node */
|
||||
mtr_t* mtr) /* in: mini-transaction */
|
||||
{
|
||||
|
|
@ -3581,7 +3602,7 @@ page_zip_copy(
|
|||
/*==========*/
|
||||
page_zip_des_t* page_zip, /* out: copy of src_zip
|
||||
(n_blobs, m_start, m_end,
|
||||
data[0..size-1]) */
|
||||
m_nonempty, data[0..size-1]) */
|
||||
page_t* page, /* out: copy of src */
|
||||
const page_zip_des_t* src_zip, /* in: compressed page */
|
||||
const page_t* src, /* in: page */
|
||||
|
|
@ -3607,9 +3628,11 @@ page_zip_copy(
|
|||
src_zip->data + FIL_PAGE_DATA,
|
||||
page_zip_get_size(page_zip) - FIL_PAGE_DATA);
|
||||
|
||||
page_zip->n_blobs = src_zip->n_blobs;
|
||||
page_zip->m_start = src_zip->m_start;
|
||||
page_zip->m_end = src_zip->m_end;
|
||||
{
|
||||
page_zip_t* data = page_zip->data;
|
||||
memcpy(page_zip, src_zip, sizeof *page_zip);
|
||||
page_zip->data = data;
|
||||
}
|
||||
ut_ad(page_zip_get_trailer_len(page_zip, index, NULL)
|
||||
+ page_zip->m_end < page_zip_get_size(page_zip));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue