|
|
|
@ -1727,6 +1727,7 @@ btr_cur_update_in_place( |
|
|
|
roll_ptr_t roll_ptr = ut_dulint_zero; |
|
|
|
trx_t* trx; |
|
|
|
ulint was_delete_marked; |
|
|
|
ibool is_hashed; |
|
|
|
mem_heap_t* heap = NULL; |
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE]; |
|
|
|
ulint* offsets = offsets_; |
|
|
|
@ -1768,7 +1769,21 @@ btr_cur_update_in_place( |
|
|
|
return(err); |
|
|
|
} |
|
|
|
|
|
|
|
if (block->is_hashed) { |
|
|
|
if (!(flags & BTR_KEEP_SYS_FLAG)) { |
|
|
|
row_upd_rec_sys_fields(rec, NULL, |
|
|
|
index, offsets, trx, roll_ptr); |
|
|
|
} |
|
|
|
|
|
|
|
was_delete_marked = rec_get_deleted_flag( |
|
|
|
rec, page_is_comp(buf_block_get_frame(block))); |
|
|
|
|
|
|
|
is_hashed = block->is_hashed; |
|
|
|
|
|
|
|
if (is_hashed) { |
|
|
|
/* TO DO: Can we skip this if none of the fields |
|
|
|
index->search_info->curr_n_fields |
|
|
|
are being updated? */ |
|
|
|
|
|
|
|
/* The function row_upd_changes_ord_field_binary works only |
|
|
|
if the update vector was built for a clustered index, we must |
|
|
|
NOT call it if index is secondary */ |
|
|
|
@ -1784,17 +1799,9 @@ btr_cur_update_in_place( |
|
|
|
rw_lock_x_lock(&btr_search_latch); |
|
|
|
} |
|
|
|
|
|
|
|
if (!(flags & BTR_KEEP_SYS_FLAG)) { |
|
|
|
row_upd_rec_sys_fields(rec, NULL, |
|
|
|
index, offsets, trx, roll_ptr); |
|
|
|
} |
|
|
|
|
|
|
|
was_delete_marked = rec_get_deleted_flag( |
|
|
|
rec, page_is_comp(buf_block_get_frame(block))); |
|
|
|
|
|
|
|
row_upd_rec_in_place(rec, index, offsets, update, page_zip); |
|
|
|
|
|
|
|
if (block->is_hashed) { |
|
|
|
if (is_hashed) { |
|
|
|
rw_lock_x_unlock(&btr_search_latch); |
|
|
|
} |
|
|
|
|
|
|
|
@ -2520,7 +2527,8 @@ btr_cur_parse_del_mark_set_clust_rec( |
|
|
|
|
|
|
|
/* We do not need to reserve btr_search_latch, as the page |
|
|
|
is only being recovered, and there cannot be a hash index to |
|
|
|
it. */ |
|
|
|
it. Besides, these fields are being updated in place |
|
|
|
and the adaptive hash index does not depend on them. */ |
|
|
|
|
|
|
|
btr_rec_set_deleted_flag(rec, page_zip, val); |
|
|
|
|
|
|
|
@ -2600,9 +2608,9 @@ btr_cur_del_mark_set_clust_rec( |
|
|
|
return(err); |
|
|
|
} |
|
|
|
|
|
|
|
if (block->is_hashed) { |
|
|
|
rw_lock_x_lock(&btr_search_latch); |
|
|
|
} |
|
|
|
/* The btr_search_latch is not needed here, because |
|
|
|
the adaptive hash index does not depend on the delete-mark |
|
|
|
and the delete-mark is being updated in place. */ |
|
|
|
|
|
|
|
page_zip = buf_block_get_page_zip(block); |
|
|
|
|
|
|
|
@ -2616,10 +2624,6 @@ btr_cur_del_mark_set_clust_rec( |
|
|
|
index, offsets, trx, roll_ptr); |
|
|
|
} |
|
|
|
|
|
|
|
if (block->is_hashed) { |
|
|
|
rw_lock_x_unlock(&btr_search_latch); |
|
|
|
} |
|
|
|
|
|
|
|
btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx, |
|
|
|
roll_ptr, mtr); |
|
|
|
|
|
|
|
@ -2695,7 +2699,8 @@ btr_cur_parse_del_mark_set_sec_rec( |
|
|
|
|
|
|
|
/* We do not need to reserve btr_search_latch, as the page |
|
|
|
is only being recovered, and there cannot be a hash index to |
|
|
|
it. */ |
|
|
|
it. Besides, the delete-mark flag is being updated in place |
|
|
|
and the adaptive hash index does not depend on it. */ |
|
|
|
|
|
|
|
btr_rec_set_deleted_flag(rec, page_zip, val); |
|
|
|
} |
|
|
|
@ -2743,16 +2748,11 @@ btr_cur_del_mark_set_sec_rec( |
|
|
|
ut_ad(!!page_rec_is_comp(rec) |
|
|
|
== dict_table_is_comp(cursor->index->table)); |
|
|
|
|
|
|
|
if (block->is_hashed) { |
|
|
|
rw_lock_x_lock(&btr_search_latch); |
|
|
|
} |
|
|
|
|
|
|
|
/* We do not need to reserve btr_search_latch, as the |
|
|
|
delete-mark flag is being updated in place and the adaptive |
|
|
|
hash index does not depend on it. */ |
|
|
|
btr_rec_set_deleted_flag(rec, buf_block_get_page_zip(block), val); |
|
|
|
|
|
|
|
if (block->is_hashed) { |
|
|
|
rw_lock_x_unlock(&btr_search_latch); |
|
|
|
} |
|
|
|
|
|
|
|
btr_cur_del_mark_set_sec_rec_log(rec, val, mtr); |
|
|
|
|
|
|
|
return(DB_SUCCESS); |
|
|
|
@ -2772,8 +2772,11 @@ btr_cur_del_unmark_for_ibuf( |
|
|
|
uncompressed */ |
|
|
|
mtr_t* mtr) /*!< in: mtr */ |
|
|
|
{ |
|
|
|
/* We do not need to reserve btr_search_latch, as the page has just |
|
|
|
been read to the buffer pool and there cannot be a hash index to it. */ |
|
|
|
/* We do not need to reserve btr_search_latch, as the page |
|
|
|
has just been read to the buffer pool and there cannot be |
|
|
|
a hash index to it. Besides, the delete-mark flag is being |
|
|
|
updated in place and the adaptive hash index does not depend |
|
|
|
on it. */ |
|
|
|
|
|
|
|
btr_rec_set_deleted_flag(rec, page_zip, FALSE); |
|
|
|
|
|
|
|
|
Bjorn Munch
14 years ago