mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
branches/zip: Do not clear the records in page_delete_rec_list_end().
page_delete_rec_list_end(): Do not invoke page_zip_clear_rec(). page_zip_clear_rec(): Remove the global declaration. Add an assertion that the record must be on the free list. Copy onl rec_offs_data_size() bytes before attempting to clear the record and to compress the page. page_zip_compress(), page_zip_write_rec(): Remove debug assertions that trx_id, roll_ptr and node_ptr of deleted records be zero-filled.
This commit is contained in:
marko
parent
96954515be
commit
e2b4592d6d
3 changed files with 9 additions and 64 deletions
|
|
@ -162,18 +162,6 @@ page_zip_write_trx_id_and_roll_ptr(
|
|||
__attribute__((nonnull));
|
||||
|
||||
/**************************************************************************
|
||||
Clear an area on the uncompressed and compressed page, if possible. */
|
||||
|
||||
void
|
||||
page_zip_clear_rec(
|
||||
/*===============*/
|
||||
page_zip_des_t* page_zip,/* in/out: compressed page */
|
||||
byte* rec, /* in: record to clear */
|
||||
dict_index_t* index, /* in: index of rec */
|
||||
const ulint* offsets,/* in: rec_get_offsets(rec, index) */
|
||||
mtr_t* mtr) /* in: mini-transaction */
|
||||
__attribute__((nonnull(1,2,3,4)));
|
||||
/**************************************************************************
|
||||
Populate the dense page directory on the compressed page
|
||||
from the sparse directory on the uncompressed row_format=compact page. */
|
||||
void
|
||||
|
|
|
|||
|
|
@ -839,8 +839,7 @@ page_delete_rec_list_end(
|
|||
|
||||
last_rec = page_rec_get_prev(page_get_supremum_rec(page));
|
||||
|
||||
if ((size == ULINT_UNDEFINED) || (n_recs == ULINT_UNDEFINED)
|
||||
|| UNIV_LIKELY_NULL(page_zip)) {
|
||||
if ((size == ULINT_UNDEFINED) || (n_recs == ULINT_UNDEFINED)) {
|
||||
rec_t* rec2 = rec;
|
||||
mem_heap_t* heap = NULL;
|
||||
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
||||
|
|
@ -854,12 +853,6 @@ page_delete_rec_list_end(
|
|||
ulint s;
|
||||
offsets = rec_get_offsets(rec2, index, offsets,
|
||||
ULINT_UNDEFINED, &heap);
|
||||
|
||||
if (UNIV_LIKELY_NULL(page_zip)) {
|
||||
page_zip_clear_rec(page_zip,
|
||||
rec2, index, offsets, NULL);
|
||||
}
|
||||
|
||||
s = rec_offs_size(offsets);
|
||||
ut_ad(rec2 - page + s - rec_offs_extra_size(offsets)
|
||||
< UNIV_PAGE_SIZE);
|
||||
|
|
|
|||
|
|
@ -675,34 +675,6 @@ page_zip_compress(
|
|||
ut_ad(!c_stream.avail_in);
|
||||
ut_ad(c_stream.next_in == src);
|
||||
|
||||
#ifdef UNIV_DEBUG
|
||||
if (memcmp(src, zero,
|
||||
DATA_TRX_ID_LEN
|
||||
+ DATA_ROLL_PTR_LEN)) {
|
||||
/* Ensure that this is an
|
||||
allocated user record. */
|
||||
ulint offs = ut_align_offset(
|
||||
rec, UNIV_PAGE_SIZE);
|
||||
byte* slot = buf_end
|
||||
- PAGE_ZIP_DIR_SLOT_SIZE
|
||||
* page_get_n_recs((page_t*)
|
||||
page);
|
||||
|
||||
for (; slot < buf_end; slot
|
||||
+= PAGE_ZIP_DIR_SLOT_SIZE) {
|
||||
if (offs == (mach_read_from_2(slot)
|
||||
& PAGE_ZIP_DIR_SLOT_MASK)) {
|
||||
|
||||
goto found_record;
|
||||
}
|
||||
}
|
||||
|
||||
/* All deleted records should be
|
||||
zero-filled. */
|
||||
ut_error;
|
||||
}
|
||||
found_record:
|
||||
#endif
|
||||
memcpy(storage - (DATA_TRX_ID_LEN
|
||||
+ DATA_ROLL_PTR_LEN)
|
||||
* (rec_get_heap_no_new(rec) - 1),
|
||||
|
|
@ -2050,10 +2022,6 @@ page_zip_write_rec(
|
|||
+ DATA_ROLL_PTR_LEN);
|
||||
|
||||
/* Store trx_id and roll_ptr separately. */
|
||||
ut_ad(!memcmp(storage
|
||||
- (DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN)
|
||||
* (heap_no - 1), zero,
|
||||
DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN));
|
||||
memcpy(storage
|
||||
- (DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN)
|
||||
* (heap_no - 1),
|
||||
|
|
@ -2106,10 +2074,6 @@ page_zip_write_rec(
|
|||
data += len;
|
||||
|
||||
/* Copy the node pointer to the uncompressed area. */
|
||||
ut_ad(!memcmp(storage - REC_NODE_PTR_SIZE
|
||||
* (heap_no - 1),
|
||||
zero,
|
||||
REC_NODE_PTR_SIZE));
|
||||
memcpy(storage - REC_NODE_PTR_SIZE
|
||||
* (heap_no - 1),
|
||||
rec + len,
|
||||
|
|
@ -2301,7 +2265,7 @@ page_zip_write_trx_id_and_roll_ptr(
|
|||
|
||||
/**************************************************************************
|
||||
Clear an area on the uncompressed and compressed page, if possible. */
|
||||
|
||||
static
|
||||
void
|
||||
page_zip_clear_rec(
|
||||
/*===============*/
|
||||
|
|
@ -2316,6 +2280,10 @@ page_zip_clear_rec(
|
|||
ut_a(page_zip_validate(page_zip, ut_align_down(rec, UNIV_PAGE_SIZE)));
|
||||
#endif /* UNIV_DEBUG || UNIV_ZIP_DEBUG */
|
||||
ut_ad(rec_offs_validate(rec, index, offsets));
|
||||
ut_ad(!page_zip_dir_find(page_zip,
|
||||
ut_align_offset(rec, UNIV_PAGE_SIZE)));
|
||||
ut_ad(page_zip_dir_find_free(page_zip,
|
||||
ut_align_offset(rec, UNIV_PAGE_SIZE)));
|
||||
|
||||
heap_no = rec_get_heap_no_new(rec);
|
||||
ut_ad(heap_no >= 2); /* exclude infimum and supremum */
|
||||
|
|
@ -2358,22 +2326,18 @@ page_zip_clear_rec(
|
|||
/* There is not enough space to log the clearing.
|
||||
Try to clear the block and to recompress the page. */
|
||||
|
||||
byte* buf = mem_alloc(rec_offs_size(offsets));
|
||||
memcpy(buf, rec - rec_offs_extra_size(offsets),
|
||||
rec_offs_size(offsets));
|
||||
byte* buf = mem_alloc(rec_offs_data_size(offsets));
|
||||
memcpy(buf, rec, rec_offs_data_size(offsets));
|
||||
|
||||
/* Do not touch the extra bytes, because the
|
||||
decompressor depends on them. */
|
||||
memset(rec, 0, rec_offs_data_size(offsets));
|
||||
|
||||
if (UNIV_UNLIKELY(!page_zip_compress(page_zip,
|
||||
ut_align_down(rec, UNIV_PAGE_SIZE),
|
||||
index, mtr))) {
|
||||
/* Compression failed. Restore the block. */
|
||||
memcpy(rec - rec_offs_extra_size(offsets), buf,
|
||||
rec_offs_size(offsets));
|
||||
memcpy(rec, buf, rec_offs_data_size(offsets));
|
||||
}
|
||||
|
||||
mem_free(buf);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue