Skip to content

Commit 2105825

Browse files
LeeBohyunLeeBohyun
authored
Update comments
1 parent d26bcb8 commit 2105825

File tree

1 file changed

+15
-36
lines changed

1 file changed

+15
-36
lines changed

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

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3091,17 +3091,13 @@ btr_page_redistribute_before_split(
30913091
ut_ad(nth_rec > 0);
30923092

30933093
if (left_page_no == FIL_NULL || right_page_no == FIL_NULL) {
3094-
//ib_logf(IB_LOG_LEVEL_INFO, "neighbor page FIL_NULL, err_exit");
30953094
goto err_exit;
30963095
}
30973096

30983097
if(btr_page_get_level(btr_root_get(index, mtr), mtr) <2){
3099-
//ib_logf(IB_LOG_LEVEL_INFO, "tree height too low");
31003098
goto err_exit;
31013099
}
31023100

3103-
3104-
//btr_page_redistribute_before_split:
31053101
//1. check if btr_can_merge_with_page and decide whether left or right page is appropriate
31063102

31073103
n_recs = page_get_n_recs(page);
@@ -3145,7 +3141,6 @@ btr_page_redistribute_before_split(
31453141
//: merge redistribute recs to right
31463142

31473143
if(page_get_n_recs(right_page) > page_get_n_recs(left_page)|| page_get_n_recs(right_page)> page_get_n_recs(page)){
3148-
//ib_logf(IB_LOG_LEVEL_INFO, "try right merge but right page has more rec");
31493144
goto err_exit;
31503145
}
31513146
if( page_get_data_size(right_page)>=fil_factor){
@@ -3156,8 +3151,7 @@ btr_page_redistribute_before_split(
31563151

31573152
page_cur_t next_page_cursor;
31583153
page_cur_t page_cursor;
3159-
//ib_logf(IB_LOG_LEVEL_INFO, "first rec: %lu, last rec: %lu, last rec of right page: %lu, first rec of right page: %lu", page_rec_get_next(page_get_infimum_rec(page)), page_rec_get_prev(page_get_supremum_rec(page)), page_rec_get_prev(page_get_supremum_rec(right_page)), page_rec_get_next(page_get_infimum_rec(right_page)));
3160-
3154+
31613155
page_cur_set_before_first(merge_block, &next_page_cursor);
31623156
page_cur_set_before_first(block, &page_cursor);
31633157

@@ -3187,8 +3181,6 @@ btr_page_redistribute_before_split(
31873181
&heap);
31883182
incl_data += rec_offs_size(offsets);
31893183

3190-
//ib_logf(IB_LOG_LEVEL_INFO, " max_ins_size: %lu, max_data_size_to_move: %lu, i: %lu, tmp_rec: %lu", max_ins_size, incl_data, i, tmp_rec);
3191-
31923184
if(incl_data > max_ins_size){
31933185
tmp_rec = page_rec_get_next(tmp_rec);
31943186
incl_data -= rec_offs_size(offsets);
@@ -3200,23 +3192,21 @@ btr_page_redistribute_before_split(
32003192
}
32013193
n_moving_recs = i;
32023194
last_moving_rec = page_rec_get_next(tmp_rec);
3203-
//ib_logf(IB_LOG_LEVEL_INFO, "right_page_merge : n_moving_recs: %lu moving_data_size= %lu, nth_rec: %lu", n_moving_recs, incl_data, nth_rec);
3204-
3205-
3195+
32063196
if(nth_rec < n_recs - n_moving_recs){
3207-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute to right, insert to cur page");
3197+
//redistribute to right, insert to cur page
32083198
insert_to_cur_page = TRUE;
32093199

32103200
if( incl_data < rec_get_converted_size(cursor->index, tuple, n_ext) || page_get_data_size(page)+rec_get_converted_size(cursor->index, tuple, n_ext)-incl_data >fil_factor){
3211-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute to right, page too full, goto err_exit");
3201+
//redistribute to right, page too full, goto err_exit
32123202
goto err_exit;
32133203
}
32143204
}else{
3215-
ib_logf(IB_LOG_LEVEL_INFO, "redistribute to right, insert to right page");
3205+
//redistribute to right, insert to right page
32163206
insert_to_cur_page = FALSE;
32173207

32183208
if(incl_data + page_get_data_size(right_page)+rec_get_converted_size(cursor->index, tuple, n_ext) >=fil_factor){
3219-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute to right, right page too full, move less rec until ins rec fits");
3209+
//right page too full, move less rec until ins rec fits
32203210

32213211
while(incl_data + page_get_data_size(right_page)+rec_get_converted_size(cursor->index, tuple, n_ext) >=fil_factor){
32223212
offsets = rec_get_offsets(last_moving_rec, cursor->index,
@@ -3236,15 +3226,13 @@ btr_page_redistribute_before_split(
32363226

32373227
}
32383228
if(nth_rec == n_recs - n_moving_recs){
3239-
//ib_logf(IB_LOG_LEVEL_INFO, "first rec of cur page");
32403229
goto err_exit;
32413230
}
32423231
if(nth_rec < n_recs - n_moving_recs){
3243-
//ib_logf(IB_LOG_LEVEL_INFO, "insert to cur page changed");
32443232
insert_to_cur_page = TRUE;
32453233

32463234
if( incl_data < rec_get_converted_size(cursor->index, tuple, n_ext) || page_get_data_size(page)+rec_get_converted_size(cursor->index, tuple, n_ext)-incl_data >fil_factor){
3247-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute to right, insert to cur page changed, page too full, goto err_exit");
3235+
//insert to cur page changed, page too full, goto err_exit
32483236
goto err_exit;
32493237
}
32503238

@@ -3254,27 +3242,21 @@ btr_page_redistribute_before_split(
32543242
//ib_logf(IB_LOG_LEVEL_INFO, "n_moving_recs <3");
32553243
goto err_exit;
32563244
}
3257-
3258-
//ib_logf(IB_LOG_LEVEL_INFO, "right_page_merge : n_moving_recs: %lu moving_data_size= %lu, nth_rec: %lu", n_moving_recs, incl_data, nth_rec);
32593245

32603246
}else{
3261-
//right page has more data than left page ft
3262-
//: merge redistribute recs to left
3247+
//right page has more data than left page
3248+
//merge redistribute recs to left
32633249
if(page_get_n_recs(left_page) > page_get_n_recs(right_page)|| page_get_n_recs(left_page)> page_get_n_recs(page)){
3264-
//ib_logf(IB_LOG_LEVEL_INFO, "try left merge but left page has more rec");
32653250
goto err_exit;
32663251
}
32673252

3268-
if( page_get_data_size(left_page)>=fil_factor){
3269-
//ib_logf(IB_LOG_LEVEL_INFO, "left page already full");
3253+
if( page_get_data_size(left_page)>=fil_factor){
32703254
goto err_exit;
32713255
}
32723256

32733257

32743258
merge_block = left_page_block;
3275-
3276-
//ib_logf(IB_LOG_LEVEL_INFO, "first rec: %lu, last rec: %lu, last rec of left page: %lu, first rec of left page: %lu", page_rec_get_next(page_get_infimum_rec(page)), page_rec_get_prev(page_get_supremum_rec(page)), page_rec_get_prev(page_get_supremum_rec(left_page)), page_rec_get_next(page_get_infimum_rec(left_page)));
3277-
3259+
32783260
page_cur_t prev_page_cursor;
32793261
page_cur_t page_cursor;
32803262

@@ -3284,9 +3266,7 @@ btr_page_redistribute_before_split(
32843266

32853267
btr_page_reorganize(&prev_page_cursor, cursor->index, mtr);
32863268
btr_page_reorganize(&page_cursor, cursor->index, mtr);
3287-
//ib_logf(IB_LOG_LEVEL_INFO, "first rec: %lu, last rec: %lu, last rec of left page: %lu, first rec of left page: %lu", page_rec_get_next(page_get_infimum_rec(page)), page_rec_get_prev(page_get_supremum_rec(page)), page_rec_get_prev(page_get_supremum_rec(left_page)), page_rec_get_next(page_get_infimum_rec(left_page)));
3288-
3289-
3269+
32903270
max_data_size_to_move = dict_index_zip_pad_optimal_page_size(index) - page_get_data_size(left_page);
32913271
n_moving_recs = page_get_n_recs(page) - (page_get_n_recs(left_page)+ page_get_n_recs(page))/2;
32923272

@@ -3324,11 +3304,11 @@ btr_page_redistribute_before_split(
33243304

33253305

33263306
if(nth_rec < n_moving_recs){
3327-
ib_logf(IB_LOG_LEVEL_INFO, "redistribute to left, insert to left page");
3307+
//redistribute to left, insert to left page
33283308
insert_to_cur_page = FALSE;
33293309

33303310
if(incl_data + page_get_data_size(left_page)+rec_get_converted_size(cursor->index, tuple, n_ext) >=fil_factor){
3331-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute to left, left page too full, move less rec until ins rec fits");
3311+
//left page too full, move less rec until ins rec fits
33323312

33333313
while(incl_data + page_get_data_size(left_page)+rec_get_converted_size(cursor->index, tuple, n_ext) >=fil_factor){
33343314
offsets = rec_get_offsets(last_moving_rec, cursor->index,
@@ -3350,7 +3330,7 @@ btr_page_redistribute_before_split(
33503330
insert_to_cur_page = TRUE;
33513331

33523332
if( incl_data < rec_get_converted_size(cursor->index, tuple, n_ext) || page_get_data_size(page)+rec_get_converted_size(cursor->index, tuple, n_ext)-incl_data >fil_factor){
3353-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute to left, insert to cur page changed, page too full, goto err_exit");
3333+
//insert to cur page changed, page too full, goto err_exit
33543334
goto err_exit;
33553335

33563336
}
@@ -3419,7 +3399,6 @@ btr_page_redistribute_before_split(
34193399

34203400
if(page_get_data_size(page)<=page_get_data_size(left_page) && page_get_data_size(page)<= page_get_data_size(right_page)){
34213401
//neighbor page has more data than cur page
3422-
//ib_logf(IB_LOG_LEVEL_INFO, "neighbor page has more data than cur page");
34233402
goto err_exit;
34243403

34253404
}

0 commit comments

Comments
 (0)