Skip to content

Commit 7842785

Browse files
LeeBohyunLeeBohyun
authored
erase debug codes
1 parent c2b86df commit 7842785

File tree

1 file changed

+5
-38
lines changed

1 file changed

+5
-38
lines changed

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

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3355,7 +3355,6 @@ btr_page_redistribute_before_split(
33553355
}
33563356

33573357
if(nth_rec >= n_moving_recs){
3358-
//ib_logf(IB_LOG_LEVEL_INFO, "insert to cur page changed");
33593358
insert_to_cur_page = TRUE;
33603359

33613360
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){
@@ -3365,29 +3364,22 @@ btr_page_redistribute_before_split(
33653364
}
33663365
}
33673366
if(nth_rec == n_moving_recs){
3368-
//ib_logf(IB_LOG_LEVEL_INFO, "first rec of cur page");
33693367
goto err_exit;
33703368
}
33713369

33723370
}else{
3373-
ib_logf(IB_LOG_LEVEL_INFO, "redistribute to left, insert to cur page");
33743371
insert_to_cur_page = TRUE;
33753372
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){
3376-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute to left, cur page too full");
33773373
goto err_exit;
33783374
}
33793375
}
33803376
if(nth_rec == n_moving_recs){
3381-
//ib_logf(IB_LOG_LEVEL_INFO, "first rec of cur page");
33823377
goto err_exit;
33833378
}
33843379
if(n_moving_recs <3){
3385-
//ib_logf(IB_LOG_LEVEL_INFO, "n_moving_recs <3");
33863380
goto err_exit;
33873381
}
33883382

3389-
//ib_logf(IB_LOG_LEVEL_INFO, "left_page_merge : n_moving_recs: %lu moving_data_size= %lu, nth_rec: %lu", n_moving_recs, incl_data, nth_rec);
3390-
33913383
merge_block = left_page_block;
33923384

33933385
}
@@ -3444,23 +3436,18 @@ btr_page_redistribute_before_split(
34443436
if (is_left) {
34453437
//move record list to left page
34463438

3447-
3448-
//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)));
3449-
34503439
ulint orig_pred = page_move_rec_list_start(
34513440
merge_block, block, last_moving_rec,
34523441
index, mtr);
34533442

34543443
if (!orig_pred) {
3455-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute : move record list to left page failed");
34563444
if (zip_size && page_is_leaf(page) && !dict_index_is_clust(cursor->index)) {
34573445
ibuf_reset_free_bits(merge_block);
34583446
ibuf_reset_free_bits(block);
34593447
}
34603448
goto err_exit;
34613449
}
3462-
//ib_logf(IB_LOG_LEVEL_INFO, "last moving rec: %lu, first rec: %lu, last rec: %lu, last rec of left page: %lu, first rec of left page: %lu", last_moving_rec, 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)));
3463-
3450+
34643451
page_cur_t prev_page_cursor;
34653452
page_cur_t page_cursor;
34663453
page_cur_set_after_last(merge_block, &prev_page_cursor);
@@ -3469,20 +3456,13 @@ btr_page_redistribute_before_split(
34693456
btr_page_reorganize(&prev_page_cursor, cursor->index, mtr);
34703457
btr_page_reorganize(&page_cursor, cursor->index, mtr);
34713458

3472-
3473-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute : move record list to left page");
3474-
//ib_logf(IB_LOG_LEVEL_INFO, "last moving rec: %lu, first rec: %lu, last rec: %lu, last rec of left page: %lu, first rec of left page: %lu", last_moving_rec, 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)));
3475-
34763459
}else{
34773460
//move record list to right page
34783461

34793462
ibool orig_succ;
34803463

34813464
offsets1 = btr_page_get_father_block(NULL, heap,
3482-
cursor->index, right_page_block, mtr, &next_father_cursor);
3483-
3484-
//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)));
3485-
3465+
cursor->index, right_page_block, mtr, &next_father_cursor);
34863466

34873467
orig_succ = page_move_rec_list_end(merge_block, block,
34883468
last_moving_rec,
@@ -3499,8 +3479,6 @@ btr_page_redistribute_before_split(
34993479
}
35003480
goto err_exit;
35013481
}
3502-
//ib_logf(IB_LOG_LEVEL_INFO, "last moving rec: %lu, first rec: %lu, last rec: %lu", last_moving_rec, page_rec_get_next(page_get_infimum_rec(right_page)),page_rec_get_prev(page_get_supremum_rec(right_page)));
3503-
//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)));
35043482

35053483
page_cur_t next_page_cursor;
35063484
page_cur_t page_cursor;
@@ -3511,9 +3489,7 @@ btr_page_redistribute_before_split(
35113489

35123490
btr_page_reorganize(&next_page_cursor, cursor->index, mtr);
35133491
btr_page_reorganize(&page_cursor, cursor->index, mtr);
3514-
3515-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute : move record list to right page end");
3516-
//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)));
3492+
35173493
}
35183494

35193495

@@ -3538,8 +3514,7 @@ btr_page_redistribute_before_split(
35383514
rec = page_cur_tuple_insert(insert_page_cursor, tuple, cursor->index,
35393515
rec_offsets, &heap, n_ext, mtr);
35403516

3541-
if (rec == NULL) {
3542-
ib_logf(IB_LOG_LEVEL_INFO, "cur page no:%lu, merge page no: %lu, insert cur rec failed", buf_block_get_page_no(block), buf_block_get_page_no(merge_block));
3517+
if (rec == NULL) {
35433518
mem_heap_empty(heap);
35443519
rec = btr_page_split_and_insert(flags, cursor, rec_offsets, &heap, tuple, n_ext, mtr);
35453520
}
@@ -3629,7 +3604,6 @@ btr_page_redistribute_before_split(
36293604
committed mini-transaction, because in crash recovery,
36303605
the free bits could momentarily be set too high. */
36313606

3632-
//ib_logf(IB_LOG_LEVEL_INFO, "redistribute : ibuf_update_free_bits_zip");
36333607
if (zip_size) {
36343608

36353609
ibuf_reset_free_bits(block);
@@ -3649,13 +3623,6 @@ btr_page_redistribute_before_split(
36493623
}
36503624

36513625
}
3652-
3653-
3654-
//ib_logf(IB_LOG_LEVEL_INFO, "function end : dict_index_is_clust(cursor->index): %lu", dict_index_is_clust(cursor->index));
3655-
//ib_logf(IB_LOG_LEVEL_INFO, "end : insert_to_cur_page: %lu",insert_to_cur_page);
3656-
ib_logf(IB_LOG_LEVEL_INFO, "end : cur_page_no: %lu, cur_page data size: %lu, cur_page n_recs: %lu", buf_block_get_page_no(block), page_get_data_size(page), page_get_n_recs(page));
3657-
ib_logf(IB_LOG_LEVEL_INFO, "end : left_page_no: %lu, left_page data size: %lu, left_page n_recs: %lu", left_page_no, page_get_data_size(left_page), page_get_n_recs(left_page));
3658-
ib_logf(IB_LOG_LEVEL_INFO, "end : right_page_no: %lu, right_page data size: %lu, right_page n_recs: %lu", right_page_no, page_get_data_size(right_page), page_get_n_recs(right_page));
36593626

36603627
ut_a(page_validate(merge_page, index));
36613628
ut_a(page_validate(page, index));
@@ -3674,7 +3641,7 @@ btr_page_redistribute_before_split(
36743641
ibuf_reset_free_bits(merge_block);
36753642
ibuf_reset_free_bits(block);
36763643
}
3677-
ib_logf(IB_LOG_LEVEL_INFO, "insert cur rec failed 2");
3644+
//data redistribution failed
36783645
goto err_exit;
36793646
}
36803647

0 commit comments

Comments
 (0)