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
90002480
Commit
90002480
authored
Jan 10, 2020
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-18115: Remove OS_AIO_LOG and IORequest::LOG
parent
f7da495a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
27 deletions
+2
-27
storage/innobase/fil/fil0fil.cc
storage/innobase/fil/fil0fil.cc
+1
-8
storage/innobase/include/os0file.h
storage/innobase/include/os0file.h
+1
-18
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+0
-1
No files found.
storage/innobase/fil/fil0fil.cc
View file @
90002480
...
...
@@ -3993,19 +3993,12 @@ fil_io(
ut_ad
(
recv_no_ibuf_operations
||
req_type
.
is_write
()
||
!
ibuf_bitmap_page
(
page_id
,
zip_size
)
||
sync
||
req_type
.
is_log
());
||
sync
);
ulint
mode
;
if
(
sync
)
{
mode
=
OS_AIO_SYNC
;
}
else
if
(
req_type
.
is_log
())
{
mode
=
OS_AIO_LOG
;
}
else
if
(
req_type
.
is_read
()
&&
!
recv_no_ibuf_operations
&&
ibuf_page
(
page_id
,
zip_size
,
NULL
))
{
...
...
storage/innobase/include/os0file.h
View file @
90002480
...
...
@@ -2,7 +2,7 @@
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2009, Percona Inc.
Copyright (c) 2013, 20
19
, MariaDB Corporation.
Copyright (c) 2013, 20
20
, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted
by Percona Inc.. Those modifications are
...
...
@@ -187,10 +187,6 @@ static const ulint OS_FILE_ERROR_MAX = 200;
/** No transformations during read/write, write as is. */
#define IORequestRead IORequest(IORequest::READ)
#define IORequestWrite IORequest(IORequest::WRITE)
#define IORequestLogRead IORequest(IORequest::LOG | IORequest::READ)
#define IORequestLogWrite IORequest(IORequest::LOG | IORequest::WRITE)
/**
The IO Context that is passed down to the low level IO code */
...
...
@@ -209,9 +205,6 @@ class IORequest {
/** Data file */
DATA_FILE
=
8
,
/** Log file request*/
LOG
=
16
,
/** Disable partial read warnings */
DISABLE_PARTIAL_IO_WARNINGS
=
32
,
...
...
@@ -279,13 +272,6 @@ class IORequest {
return
((
m_type
&
WRITE
)
==
WRITE
);
}
/** @return true if it is a redo log write */
bool
is_log
()
const
MY_ATTRIBUTE
((
warn_unused_result
))
{
return
((
m_type
&
LOG
)
==
LOG
);
}
/** Clear the punch hole flag */
void
clear_punch_hole
()
{
...
...
@@ -417,9 +403,6 @@ static const ulint OS_AIO_NORMAL = 21;
/** Asynchronous i/o for ibuf pages or ibuf bitmap pages */
static
const
ulint
OS_AIO_IBUF
=
22
;
/** Asynchronous i/o for the log */
static
const
ulint
OS_AIO_LOG
=
23
;
/**Calling thread will wait for the i/o to complete,
and perform IO completion routine itself;
can be used for any pages, ibuf or non-ibuf. This is used to save
...
...
storage/innobase/os/os0file.cc
View file @
90002480
...
...
@@ -3138,7 +3138,6 @@ os_file_io(
bytes_returned
+=
n_bytes
;
if
(
offset
>
0
&&
!
type
.
is_log
()
&&
type
.
is_write
()
&&
type
.
punch_hole
())
{
*
err
=
type
.
punch_hole
(
file
,
offset
,
n
);
...
...
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