1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move os_file_write() before posix_fadvise(POSIX_FADV_DONTNEED).

Browse Source 
It is wrong to tell the OS that a block is not going to be accessed and
write to it immediately afterwards.
This commit is contained in:
Vasil Dimov 2010-05-21 20:56:47 +03:00
parent 198a0ae9ae
commit b22407dadc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
storage/innobase/row/row0merge.c
View File

@ -740,6 +740,12 @@ row_merge_write(
{ {
ib_uint64_t ofs = ((ib_uint64_t) offset) ib_uint64_t ofs = ((ib_uint64_t) offset)
* sizeof(row_merge_block_t); * sizeof(row_merge_block_t);
ibool ret;
ret = os_file_write("(merge)", OS_FILE_FROM_FD(fd), buf,
(ulint) (ofs & 0xFFFFFFFF),
(ulint) (ofs >> 32),
sizeof(row_merge_block_t));
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
if (row_merge_print_block_write) { if (row_merge_print_block_write) {
@ -754,10 +760,7 @@ row_merge_write(
posix_fadvise(fd, ofs, sizeof *buf, POSIX_FADV_DONTNEED); posix_fadvise(fd, ofs, sizeof *buf, POSIX_FADV_DONTNEED);
#endif /* POSIX_FADV_DONTNEED */ #endif /* POSIX_FADV_DONTNEED */
return(UNIV_LIKELY(os_file_write("(merge)", OS_FILE_FROM_FD(fd), buf, return(UNIV_LIKELY(ret));
(ulint) (ofs & 0xFFFFFFFF),
(ulint) (ofs >> 32),
sizeof(row_merge_block_t))));
} }
/********************************************************************//** /********************************************************************//**