database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Be more block cache friendly

Browse Source
This commit is contained in:
Marko Mäkelä
2026-10-16 13:22:32 +03:00
parent c98b67beaa
commit ca672f3bc7
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_backup.cc
View File

@@ -151,6 +151,9 @@ int copy_entire_file(int src, int dst) noexcept
uint64_t end(lseek(src, 0, SEEK_END));
#ifdef POSIX_FADV_SEQUENTIAL
std::ignore= posix_fadvise(src, 0, 0, POSIX_FADV_SEQUENTIAL);
#endif
#ifdef POSIX_FADV_DONTNEED
std::ignore= posix_fadvise(dst, 0, 0, POSIX_FADV_DONTNEED);
#endif
int ret;
# ifdef copy_file_shortcut

24
storage/innobase/handler/backup_innodb.cc
View File

@@ -349,7 +349,12 @@ private:
int log= openat(target.fd, path.c_str(),
O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666);
if (log >= 0)
{
# ifdef POSIX_FADV_DONTNEED
std::ignore= posix_fadvise(log, 0, 0, POSIX_FADV_DONTNEED);
# endif
return log;
}
#else
std::string path{target.path};
path.push_back('/');
@@ -443,6 +448,9 @@ private:
d= openat(target->fd, d_, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666);
if (d < 0)
goto error_return;
# ifdef POSIX_FADV_DONTNEED
std::ignore= posix_fadvise(d, 0, 0, POSIX_FADV_DONTNEED);
# endif
#endif
const uint64_t end{log_sys.START_OFFSET + last_lsn - hl};
int f= extend_log(d, end);
@@ -2107,9 +2115,6 @@ public:
chunk->offset= os_file_get_size(src);
#else
chunk->offset= uint64_t(lseek(src, 0, SEEK_END));
# ifdef POSIX_FADV_SEQUENTIAL
std::ignore= posix_fadvise(src, 0, chunk->offset, POSIX_FADV_SEQUENTIAL);
# endif
if (dst != sink.stream)
{
err= copy_entire_file(src, dst);
@@ -2118,6 +2123,9 @@ public:
#endif
/* Omit the checkpoint header from the stream. */
chunk[-1].length= chunk->offset - log_sys.START_OFFSET;
# ifdef POSIX_FADV_SEQUENTIAL
std::ignore= posix_fadvise(src, 0, chunk->offset, POSIX_FADV_SEQUENTIAL);
# endif
goto stream_file;
}
else
@@ -2162,6 +2170,9 @@ public:
}
else
{
# ifdef POSIX_FADV_DONTNEED
std::ignore= posix_fadvise(dst, 0, 0, POSIX_FADV_DONTNEED);
# endif
err= extend(dst, chunk->offset) ||
backup::copy(src, dst, chunk[-1].offset, chunk[-1].offset +
chunk[-1].length) ||
@@ -2328,6 +2339,9 @@ int InnoDB_backup::backup(IF_WIN(const char *,int) target, fil_node_t *node,
}
goto fail;
}
# ifdef POSIX_FADV_DONTNEED
std::ignore= posix_fadvise(f, 0, 0, POSIX_FADV_DONTNEED);
# endif
#endif
const uint32_t page_size{node->space->physical_size()};
int err{0};
@@ -2416,6 +2430,10 @@ int InnoDB_backup::backup(IF_WIN(const char *,int) target, fil_node_t *node,
}
}
#ifdef POSIX_FADV_DONTNEED
std::ignore= posix_fadvise(node->handle, 0, 0, POSIX_FADV_DONTNEED);
#endif
if (IF_WIN(!CloseHandle,close)(f) | err)
{
if (err != 2)