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: Note that page_cur_tuple_insert() can fail without attempting

Browse source 
to reorganize a compressed page.  This mistake was made in r1308.
This commit is contained in:
marko 2007-02-28 11:08:59 +00:00
parent eddd572abd
commit d32cd9647b
3 changed files with 25 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
btr/btr0btr.c
View file

@ -1962,13 +1962,10 @@ func_start:
goto func_exit;
}
/* 8. If insert did not fit, try page reorganization.
For compressed pages, that is already attempted in
page_cur_tuple_insert(). */
/* 8. If insert did not fit, try page reorganization */
if (UNIV_UNLIKELY
(buf_block_get_page_zip(insert_block)
|| !btr_page_reorganize(insert_block, cursor->index, mtr))) {
(!btr_page_reorganize(insert_block, cursor->index, mtr))) {
goto insert_failed;
}

40
btr/btr0cur.c
View file

@ -883,18 +883,8 @@ btr_cur_insert_if_possible(
rec = page_cur_tuple_insert(page_cursor, tuple,
cursor->index, ext, n_ext, mtr);
if (buf_block_get_page_zip(block)) {
if (!dict_index_is_clust(cursor->index)) {
/* Update the free bits in the insert buffer. */
ibuf_update_free_bits_if_full(
cursor->index, buf_block_get_zip_size(block),
block, UNIV_PAGE_SIZE, ULINT_UNDEFINED);
}
} else if (UNIV_UNLIKELY(!rec)) {
/* If record did not fit, reorganize.
For compressed pages, this is attempted already in
page_cur_tuple_insert(). */
if (UNIV_UNLIKELY(!rec)) {
/* If record did not fit, reorganize */
if (btr_page_reorganize(block, cursor->index, mtr)) {
@ -907,6 +897,14 @@ btr_cur_insert_if_possible(
}
}
if (buf_block_get_page_zip(block)
&& !dict_index_is_clust(cursor->index)) {
/* Update the free bits in the insert buffer. */
ibuf_update_free_bits_if_full(
cursor->index, buf_block_get_zip_size(block),
block, UNIV_PAGE_SIZE, ULINT_UNDEFINED);
}
return(rec);
}
@ -1185,15 +1183,12 @@ fail_err:
}
}
if (UNIV_LIKELY(*rec != NULL)) {
} else if (zip_size) {
/* If the record did not fit on a compressed page, fail. */
goto fail;
} else {
/* If the record did not fit, reorganize. For compressed
pages, this is attempted already in page_cur_tuple_insert(). */
if (UNIV_UNLIKELY(!*rec) && UNIV_LIKELY(!reorg)) {
/* If the record did not fit, reorganize */
if (UNIV_UNLIKELY(!btr_page_reorganize(block, index, mtr))) {
ut_error;
ut_a(zip_size);
goto fail;
}
ut_ad(page_get_max_insert_size(page, 1) == max_size);
@ -1206,6 +1201,11 @@ fail_err:
ext, n_ext, mtr);
if (UNIV_UNLIKELY(!*rec)) {
if (UNIV_LIKELY(zip_size != 0)) {
goto fail;
}
fputs("InnoDB: Error: cannot insert tuple ", stderr);
dtuple_print(stderr, entry);
fputs(" into ", stderr);

14
ibuf/ibuf0ibuf.c
View file

@ -2929,13 +2929,6 @@ dump:
return;
}
if (UNIV_LIKELY_NULL(buf_block_get_page_zip(block))) {
/* For compressed pages, reorganization was
attempted (in vain) in page_cur_tuple_insert(). */
goto ibuf_fail;
}
/* If the record did not fit, reorganize */
btr_page_reorganize(block, index, mtr);
@ -2949,7 +2942,6 @@ dump:
ulint page_no;
ulint zip_size;
ibuf_fail:
ut_print_timestamp(stderr);
fprintf(stderr,
@ -3162,7 +3154,7 @@ ibuf_merge_or_delete_for_page(
return;
}
if (update_ibuf_bitmap) {
if (UNIV_LIKELY(update_ibuf_bitmap)) {
ut_a(ut_is_2pow(zip_size));
if (ibuf_fixed_addr_page(space, zip_size, page_no)
@ -3177,7 +3169,7 @@ ibuf_merge_or_delete_for_page(
tablespace_being_deleted = fil_inc_pending_ibuf_merges(space);
if (tablespace_being_deleted) {
if (UNIV_UNLIKELY(tablespace_being_deleted)) {
/* Do not try to read the bitmap page from space;
just delete the ibuf records for the page */
@ -3377,7 +3369,7 @@ reset_bit:
ibuf_print(); */
}
#endif
if (update_ibuf_bitmap) {
if (UNIV_LIKELY(update_ibuf_bitmap)) {
bitmap_page = ibuf_bitmap_get_map_page(space, page_no,
zip_size, &mtr);
ibuf_bitmap_page_set_bits(bitmap_page, page_no, zip_size,