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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6ca06546
Commit
6ca06546
authored
May 27, 2021
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-19514 fixup: Optimize ibuf_merge_or_delete_for_page() calls
parent
601eb411
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
storage/innobase/buf/buf0buf.cc
storage/innobase/buf/buf0buf.cc
+2
-1
storage/innobase/ibuf/ibuf0ibuf.cc
storage/innobase/ibuf/ibuf0ibuf.cc
+6
-5
No files found.
storage/innobase/buf/buf0buf.cc
View file @
6ca06546
...
...
@@ -3812,7 +3812,8 @@ buf_page_create(fil_space_t *space, uint32_t offset,
/* Delete possible entries for the page from the insert buffer:
such can exist if the page belonged to an index which was dropped */
if
(
!
recv_recovery_is_on
())
if
(
page_id
<
page_id_t
{
SRV_SPACE_ID_UPPER_BOUND
,
0
}
&&
!
recv_recovery_is_on
())
ibuf_merge_or_delete_for_page
(
nullptr
,
page_id
,
zip_size
);
static_assert
(
FIL_PAGE_PREV
+
4
==
FIL_PAGE_NEXT
,
"adjacent"
);
...
...
storage/innobase/ibuf/ibuf0ibuf.cc
View file @
6ca06546
...
...
@@ -4203,6 +4203,10 @@ subsequently was dropped.
void
ibuf_merge_or_delete_for_page
(
buf_block_t
*
block
,
const
page_id_t
page_id
,
ulint
zip_size
)
{
if
(
trx_sys_hdr_page
(
page_id
))
{
return
;
}
btr_pcur_t
pcur
;
#ifdef UNIV_IBUF_DEBUG
ulint
volume
=
0
;
...
...
@@ -4217,11 +4221,8 @@ void ibuf_merge_or_delete_for_page(buf_block_t *block, const page_id_t page_id,
ut_ad
(
!
block
||
page_id
==
block
->
page
.
id
());
ut_ad
(
!
block
||
block
->
page
.
state
()
==
BUF_BLOCK_FILE_PAGE
);
ut_ad
(
!
block
||
block
->
page
.
status
==
buf_page_t
::
NORMAL
);
if
(
trx_sys_hdr_page
(
page_id
)
||
fsp_is_system_temporary
(
page_id
.
space
()))
{
return
;
}
ut_ad
(
!
trx_sys_hdr_page
(
page_id
));
ut_ad
(
page_id
<
page_id_t
(
SRV_SPACE_ID_UPPER_BOUND
,
0
));
const
ulint
physical_size
=
zip_size
?
zip_size
:
srv_page_size
;
...
...
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