Commit 90002480 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-18115: Remove OS_AIO_LOG and IORequest::LOG

parent f7da495a
...@@ -3993,19 +3993,12 @@ fil_io( ...@@ -3993,19 +3993,12 @@ fil_io(
ut_ad(recv_no_ibuf_operations ut_ad(recv_no_ibuf_operations
|| req_type.is_write() || req_type.is_write()
|| !ibuf_bitmap_page(page_id, zip_size) || !ibuf_bitmap_page(page_id, zip_size)
|| sync || sync);
|| req_type.is_log());
ulint mode; ulint mode;
if (sync) { if (sync) {
mode = OS_AIO_SYNC; mode = OS_AIO_SYNC;
} else if (req_type.is_log()) {
mode = OS_AIO_LOG;
} else if (req_type.is_read() } else if (req_type.is_read()
&& !recv_no_ibuf_operations && !recv_no_ibuf_operations
&& ibuf_page(page_id, zip_size, NULL)) { && ibuf_page(page_id, zip_size, NULL)) {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2009, Percona Inc. Copyright (c) 2009, Percona Inc.
Copyright (c) 2013, 2019, MariaDB Corporation. Copyright (c) 2013, 2020, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted Portions of this file contain modifications contributed and copyrighted
by Percona Inc.. Those modifications are by Percona Inc.. Those modifications are
...@@ -187,10 +187,6 @@ static const ulint OS_FILE_ERROR_MAX = 200; ...@@ -187,10 +187,6 @@ static const ulint OS_FILE_ERROR_MAX = 200;
/** No transformations during read/write, write as is. */ /** No transformations during read/write, write as is. */
#define IORequestRead IORequest(IORequest::READ) #define IORequestRead IORequest(IORequest::READ)
#define IORequestWrite IORequest(IORequest::WRITE) #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 */ The IO Context that is passed down to the low level IO code */
...@@ -209,9 +205,6 @@ class IORequest { ...@@ -209,9 +205,6 @@ class IORequest {
/** Data file */ /** Data file */
DATA_FILE = 8, DATA_FILE = 8,
/** Log file request*/
LOG = 16,
/** Disable partial read warnings */ /** Disable partial read warnings */
DISABLE_PARTIAL_IO_WARNINGS = 32, DISABLE_PARTIAL_IO_WARNINGS = 32,
...@@ -279,13 +272,6 @@ class IORequest { ...@@ -279,13 +272,6 @@ class IORequest {
return((m_type & WRITE) == WRITE); 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 */ /** Clear the punch hole flag */
void clear_punch_hole() void clear_punch_hole()
{ {
...@@ -417,9 +403,6 @@ static const ulint OS_AIO_NORMAL = 21; ...@@ -417,9 +403,6 @@ static const ulint OS_AIO_NORMAL = 21;
/** Asynchronous i/o for ibuf pages or ibuf bitmap pages */ /** Asynchronous i/o for ibuf pages or ibuf bitmap pages */
static const ulint OS_AIO_IBUF = 22; 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, /**Calling thread will wait for the i/o to complete,
and perform IO completion routine itself; and perform IO completion routine itself;
can be used for any pages, ibuf or non-ibuf. This is used to save can be used for any pages, ibuf or non-ibuf. This is used to save
......
...@@ -3138,7 +3138,6 @@ os_file_io( ...@@ -3138,7 +3138,6 @@ os_file_io(
bytes_returned += n_bytes; bytes_returned += n_bytes;
if (offset > 0 if (offset > 0
&& !type.is_log()
&& type.is_write() && type.is_write()
&& type.punch_hole()) { && type.punch_hole()) {
*err = type.punch_hole(file, offset, n); *err = type.punch_hole(file, offset, n);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment