Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
7f1f7b93
Commit
7f1f7b93
authored
Mar 31, 2004
by
marko@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
InnoDB: cleanup of B-tree cursor operations
parent
7f2a0074
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
14 deletions
+18
-14
innobase/btr/btr0cur.c
innobase/btr/btr0cur.c
+18
-14
No files found.
innobase/btr/btr0cur.c
View file @
7f1f7b93
...
@@ -120,7 +120,6 @@ static
...
@@ -120,7 +120,6 @@ static
void
void
btr_cur_latch_leaves
(
btr_cur_latch_leaves
(
/*=================*/
/*=================*/
dict_tree_t
*
tree
__attribute__
((
unused
)),
/* in: index tree */
page_t
*
page
,
/* in: leaf page where the search
page_t
*
page
,
/* in: leaf page where the search
converged */
converged */
ulint
space
,
/* in: space id */
ulint
space
,
/* in: space id */
...
@@ -133,7 +132,7 @@ btr_cur_latch_leaves(
...
@@ -133,7 +132,7 @@ btr_cur_latch_leaves(
ulint
right_page_no
;
ulint
right_page_no
;
page_t
*
get_page
;
page_t
*
get_page
;
ut_ad
(
tree
&&
page
&&
mtr
);
ut_ad
(
page
&&
mtr
);
if
(
latch_mode
==
BTR_SEARCH_LEAF
)
{
if
(
latch_mode
==
BTR_SEARCH_LEAF
)
{
...
@@ -365,17 +364,19 @@ btr_cur_search_to_nth_level(
...
@@ -365,17 +364,19 @@ btr_cur_search_to_nth_level(
B-tree. These let us end up in the right B-tree leaf. In that leaf
B-tree. These let us end up in the right B-tree leaf. In that leaf
we use the original search mode. */
we use the original search mode. */
if
(
mode
==
PAGE_CUR_GE
)
{
switch
(
mode
)
{
case
PAGE_CUR_GE
:
page_mode
=
PAGE_CUR_L
;
page_mode
=
PAGE_CUR_L
;
}
else
if
(
mode
==
PAGE_CUR_G
)
{
break
;
page_mode
=
PAGE_CUR_LE
;
case
PAGE_CUR_G
:
}
else
if
(
mode
==
PAGE_CUR_LE
)
{
page_mode
=
PAGE_CUR_LE
;
page_mode
=
PAGE_CUR_LE
;
}
else
if
(
mode
==
PAGE_CUR_LE_OR_EXTENDS
)
{
break
;
page_mode
=
PAGE_CUR_LE_OR_EXTENDS
;
default:
}
else
{
ut_ad
(
mode
==
PAGE_CUR_L
ut_ad
(
mode
==
PAGE_CUR_L
);
||
mode
==
PAGE_CUR_LE
page_mode
=
PAGE_CUR_L
;
||
mode
==
PAGE_CUR_LE_OR_EXTENDS
);
page_mode
=
mode
;
break
;
}
}
/* Loop and search until we arrive at the desired level */
/* Loop and search until we arrive at the desired level */
...
@@ -450,7 +451,7 @@ retry_page_get:
...
@@ -450,7 +451,7 @@ retry_page_get:
if
(
height
==
0
)
{
if
(
height
==
0
)
{
if
(
rw_latch
==
RW_NO_LATCH
)
{
if
(
rw_latch
==
RW_NO_LATCH
)
{
btr_cur_latch_leaves
(
tree
,
page
,
space
,
btr_cur_latch_leaves
(
page
,
space
,
page_no
,
latch_mode
,
cursor
,
page_no
,
latch_mode
,
cursor
,
mtr
);
mtr
);
}
}
...
@@ -477,6 +478,9 @@ retry_page_get:
...
@@ -477,6 +478,9 @@ retry_page_get:
/* If this is the desired level, leave the loop */
/* If this is the desired level, leave the loop */
ut_ad
(
height
==
btr_page_get_level
(
page_cur_get_page
(
page_cursor
),
mtr
));
if
(
level
==
height
)
{
if
(
level
==
height
)
{
if
(
level
>
0
)
{
if
(
level
>
0
)
{
...
@@ -588,7 +592,7 @@ btr_cur_open_at_index_side(
...
@@ -588,7 +592,7 @@ btr_cur_open_at_index_side(
}
}
if
(
height
==
0
)
{
if
(
height
==
0
)
{
btr_cur_latch_leaves
(
tree
,
page
,
space
,
page_no
,
btr_cur_latch_leaves
(
page
,
space
,
page_no
,
latch_mode
,
cursor
,
mtr
);
latch_mode
,
cursor
,
mtr
);
/* In versions <= 3.23.52 we had forgotten to
/* In versions <= 3.23.52 we had forgotten to
...
@@ -694,7 +698,7 @@ btr_cur_open_at_rnd_pos(
...
@@ -694,7 +698,7 @@ btr_cur_open_at_rnd_pos(
}
}
if
(
height
==
0
)
{
if
(
height
==
0
)
{
btr_cur_latch_leaves
(
tree
,
page
,
space
,
page_no
,
btr_cur_latch_leaves
(
page
,
space
,
page_no
,
latch_mode
,
cursor
,
mtr
);
latch_mode
,
cursor
,
mtr
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment