Skip to content

Commit d26bcb8

Browse files
authored
Delete split monitoring
1 parent 3913680 commit d26bcb8

File tree

1 file changed

+8
-32
lines changed

1 file changed

+8
-32
lines changed

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

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3083,8 +3083,6 @@ btr_page_redistribute_before_split(
30833083
}
30843084

30853085

3086-
3087-
//0.1. neighbor page related info
30883086
left_page_no = btr_page_get_prev(page, mtr);
30893087
right_page_no = btr_page_get_next(page, mtr);
30903088

@@ -3102,9 +3100,9 @@ btr_page_redistribute_before_split(
31023100
goto err_exit;
31033101
}
31043102

3105-
//ib_logf(IB_LOG_LEVEL_INFO, "btr_page_redistribute_before_split: redistribute start");
31063103

3107-
//btr_page_redistribute_before_split: 1. check if btr_can_merge_with_page and decide whether left or right page is appropriate
3104+
//btr_page_redistribute_before_split:
3105+
//1. check if btr_can_merge_with_page and decide whether left or right page is appropriate
31083106

31093107
n_recs = page_get_n_recs(page);
31103108
data_size = page_get_data_size(page);
@@ -3131,18 +3129,12 @@ btr_page_redistribute_before_split(
31313129

31323130
if((page_get_data_size(page)<=page_get_data_size(left_page)) && (page_get_data_size(page)<= page_get_data_size(right_page))){
31333131
//neighbor page has more data than cur page
3134-
//ib_logf(IB_LOG_LEVEL_INFO, "btr_page_redistribute_before_split: neighbor page has more data than cur page");
3135-
goto err_exit;
3132+
goto err_exit;
31363133

3137-
}else{
3138-
ib_logf(IB_LOG_LEVEL_INFO, "start: cur_page_no: %lu, cur_page data size: %lu, cur_page n_recs: %lu", buf_block_get_page_no(block), data_size, n_recs);
3139-
ib_logf(IB_LOG_LEVEL_INFO, "start: 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));
3140-
ib_logf(IB_LOG_LEVEL_INFO, "start: 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));
3141-
3134+
}else{
31423135

31433136
if(page_get_data_size(page)<=page_get_data_size(left_page) && page_get_data_size(page)<= page_get_data_size(right_page)){
31443137
//neighbor page has more data than cur page
3145-
//ib_logf(IB_LOG_LEVEL_INFO, "btr_page_redistribute_before_split: neighbor page has more data than cur page");
31463138
goto err_exit;
31473139

31483140
}
@@ -3432,7 +3424,8 @@ btr_page_redistribute_before_split(
34323424

34333425
}
34343426

3435-
//btr_page_redistribute_before_split: 2. move records to the merge page.
3427+
//btr_page_redistribute_before_split:
3428+
//2. move records to the merge page.
34363429
if (is_left) {
34373430
//move record list to left page
34383431

@@ -3486,7 +3479,6 @@ btr_page_redistribute_before_split(
34863479
page_cur_set_before_first(merge_block, &next_page_cursor);
34873480
page_cur_set_before_first(block, &page_cursor);
34883481

3489-
34903482
btr_page_reorganize(&next_page_cursor, cursor->index, mtr);
34913483
btr_page_reorganize(&page_cursor, cursor->index, mtr);
34923484

@@ -3504,10 +3496,8 @@ btr_page_redistribute_before_split(
35043496
ut_a(insert_block == merge_block);
35053497
}
35063498

3507-
35083499
insert_page_cursor = btr_cur_get_page_cur(cursor);
35093500

3510-
35113501
page_cur_search(insert_block, cursor->index, tuple,
35123502
PAGE_CUR_LE, insert_page_cursor);
35133503

@@ -3551,7 +3541,6 @@ btr_page_redistribute_before_split(
35513541
//delete right page father cursor (infimum changed)
35523542
//build new ptr for right page infimum rec and insert to right page's father page
35533543

3554-
35553544
compressed = btr_cur_pessimistic_delete(
35563545
&err, TRUE, &next_father_cursor,
35573546
BTR_CREATE_FLAG, RB_NONE, mtr);
@@ -3607,7 +3596,6 @@ btr_page_redistribute_before_split(
36073596
if (zip_size) {
36083597

36093598
ibuf_reset_free_bits(block);
3610-
36113599
ibuf_reset_free_bits(merge_block);
36123600

36133601
} else {
@@ -3645,8 +3633,7 @@ btr_page_redistribute_before_split(
36453633
goto err_exit;
36463634
}
36473635

3648-
err_exit:
3649-
3636+
err_exit:
36503637
btr_cur_position(
36513638
index,
36523639
page_rec_get_nth(block->frame, nth_rec),
@@ -3742,13 +3729,6 @@ btr_page_split_and_insert(
37423729
tpcc_table = TRUE;
37433730
}
37443731

3745-
/* mijin : page split monitoring */
3746-
3747-
if (tpcc_table && page_is_leaf(page)) {
3748-
//ib_logf(IB_LOG_LEVEL_INFO, "Before Split %lu (%lu): original = %lu / %lu / %d / %lu / %lu / %s\n",buf_block_get_space(btr_cur_get_block(cursor)), rec_get_converted_size(cursor->index, tuple, n_ext), buf_block_get_page_no(block), page_get_n_recs(page), page_is_leaf(page), dict_index_is_clust(cursor->index), dict_index_is_unique(cursor->index), cursor->index->name);
3749-
}
3750-
/* end */
3751-
37523732
/* try to insert to the next page if possible before split */
37533733
rec = btr_insert_into_right_sibling(
37543734
flags, cursor, offsets, *heap, tuple, n_ext, mtr);
@@ -4081,11 +4061,7 @@ btr_page_split_and_insert(
40814061
buf_block_get_page_no(left_block),
40824062
buf_block_get_page_no(right_block));
40834063
#endif
4084-
/* mijin */
4085-
if (tpcc_table && page_is_leaf(page)) {
4086-
ib_logf(IB_LOG_LEVEL_INFO, "After Split %lu (%lu): original = %lu / %lu / %d, new = %lu / %lu / %d\n",buf_block_get_space(btr_cur_get_block(cursor)), rec_get_converted_size(cursor->index, tuple, n_ext), (ulint)buf_block_get_page_no(block), page_get_n_recs(page), page_is_leaf(page), (ulint)buf_block_get_page_no(new_block), page_get_n_recs(new_page), page_is_leaf(new_page));
4087-
}
4088-
/* end */
4064+
40894065

40904066
MONITOR_INC(MONITOR_INDEX_SPLIT);
40914067

0 commit comments

Comments
 (0)