Skip to content

Commit ea8a822

Browse files
authored
Update btr0btr.cc
1 parent 0d8d8c9 commit ea8a822

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

mysql-5.6.26/storage/innobase/btr/btr0btr.cc

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,7 +3054,6 @@ btr_page_redistribute_before_split(
30543054
n_uniq = dict_index_get_n_unique_in_tree(cursor->index);
30553055

30563056
//btr_page_redistribute_before_split: 0. get ready
3057-
//0.0. cur page related info
30583057
block = btr_cur_get_block(cursor);
30593058
page = btr_cur_get_page(cursor);
30603059
index = btr_cur_get_index(cursor);
@@ -3108,36 +3107,28 @@ btr_page_redistribute_before_split(
31083107
//btr_page_redistribute_before_split: 1. check if btr_can_merge_with_page and decide whether left or right page is appropriate
31093108

31103109
n_recs = page_get_n_recs(page);
3111-
data_size = page_get_data_size(page);
3110+
data_size = page_get_data_size(page);
31123111

31133112
is_left = TRUE;
3114-
3115-
left_page_block = btr_block_get(space, zip_size, left_page_no, RW_X_LATCH, index,
3116-
mtr);
3113+
left_page_block = btr_block_get(space, zip_size, left_page_no, RW_X_LATCH, index,mtr);
31173114
left_page = buf_block_get_frame(left_page_block);
3118-
3119-
right_page_block = btr_block_get(space, zip_size, right_page_no, RW_X_LATCH, index,
3120-
mtr);
3115+
right_page_block = btr_block_get(space, zip_size, right_page_no, RW_X_LATCH, index, mtr);
31213116
right_page = buf_block_get_frame(right_page_block);
31223117

31233118
offsets = NULL;
3124-
3125-
3126-
3119+
31273120
btr_page_get_father(
31283121
cursor->index, block, mtr, &father_cursor);
31293122

31303123
ulint max_data_size_to_move;
31313124

3132-
31333125
max_data_size_to_move = 0;
31343126
insert_block = block;
31353127

31363128
ulint* offsets1;
31373129

3138-
3139-
3140-
3130+
//choose the merge page
3131+
31413132
if((page_get_data_size(page)<=page_get_data_size(left_page)) && (page_get_data_size(page)<= page_get_data_size(right_page))){
31423133
//neighbor page has more data than cur page
31433134
//ib_logf(IB_LOG_LEVEL_INFO, "btr_page_redistribute_before_split: neighbor page has more data than cur page");

0 commit comments

Comments
 (0)