mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/innodb+: btr_cur_search_to_nth_level(): Add a TODO comment that

Browse source 
when encountering an empty leaf page, we should advance to the right
siblings until a non-empty page is found.  Move the initialization of
cursor->ibuf_cnt to a better place.
This commit is contained in:
marko 2008-10-15 10:18:28 +00:00
parent f7e76f23c1
commit d6d6f656ee
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
btr/btr0cur.c
View file

@ -658,6 +658,9 @@ retry_page_get:
page_mode = mode;
}
/* TO DO: if the page is empty, advance to the next page.
There may be a match on the first nonempty right sibling. */
page_cur_search_with_match(
block, index, tuple, page_mode, &up_match, &up_bytes,
&low_match, &low_bytes, page_cursor);
@ -692,19 +695,14 @@ retry_page_get:
node_ptr = page_cur_get_rec(page_cursor);
offsets = rec_get_offsets(
node_ptr, cursor->index, offsets, ULINT_UNDEFINED, &heap);
/* Go to the child node */
page_no = btr_node_ptr_get_child_page_no(node_ptr, offsets);
if (dict_index_is_ibuf(index) && height == level) {
if (height == 0 && dict_index_is_ibuf(index)) {
/* We're doing a search on an ibuf tree and we're one level
above the leaf page. (Assuming level == 0, which it should
be.) */
above the leaf page. */
ulint is_min_rec;
ut_ad(level == 0);
is_min_rec = rec_get_info_bits(node_ptr, 0)
& REC_INFO_MIN_REC_FLAG;
@ -716,6 +714,12 @@ retry_page_get:
}
}
offsets = rec_get_offsets(
node_ptr, index, offsets, ULINT_UNDEFINED, &heap);
/* Go to the child node */
page_no = btr_node_ptr_get_child_page_no(node_ptr, offsets);
goto search_loop;
loop_end: