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

Use the correct len instead of sizeof(void) in posix_fadvise()

Browse Source 
Also explain in the comment the units of the "offset" parameter
This commit is contained in:
Vasil Dimov 2010-05-21 21:09:51 +03:00
parent b22407dadc
commit df1a56253f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -696,7 +696,9 @@ ibool
row_merge_read( row_merge_read(
/*===========*/ /*===========*/
int fd, /*!< in: file descriptor */ int fd, /*!< in: file descriptor */
ulint offset, /*!< in: offset where to read */ ulint offset, /*!< in: offset where to read
in number of row_merge_block_t
elements */
row_merge_block_t* buf) /*!< out: data */ row_merge_block_t* buf) /*!< out: data */
{ {
ib_uint64_t ofs = ((ib_uint64_t) offset) * sizeof *buf; ib_uint64_t ofs = ((ib_uint64_t) offset) * sizeof *buf;
@ -735,17 +737,18 @@ ibool
row_merge_write( row_merge_write(
/*============*/ /*============*/
int fd, /*!< in: file descriptor */ int fd, /*!< in: file descriptor */
ulint offset, /*!< in: offset where to write */ ulint offset, /*!< in: offset where to write,
in number of row_merge_block_t elements */
const void* buf) /*!< in: data */ const void* buf) /*!< in: data */
{ {
ib_uint64_t ofs = ((ib_uint64_t) offset) size_t buf_len = sizeof(row_merge_block_t);
* sizeof(row_merge_block_t); ib_uint64_t ofs = buf_len * (ib_uint64_t) offset;
ibool ret; ibool ret;
ret = os_file_write("(merge)", OS_FILE_FROM_FD(fd), buf, ret = os_file_write("(merge)", OS_FILE_FROM_FD(fd), buf,
(ulint) (ofs & 0xFFFFFFFF), (ulint) (ofs & 0xFFFFFFFF),
(ulint) (ofs >> 32), (ulint) (ofs >> 32),
sizeof(row_merge_block_t)); buf_len);
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
if (row_merge_print_block_write) { if (row_merge_print_block_write) {
@ -757,7 +760,7 @@ row_merge_write(
#ifdef POSIX_FADV_DONTNEED #ifdef POSIX_FADV_DONTNEED
/* The block will be needed on the next merge pass, /* The block will be needed on the next merge pass,
but it can be evicted from the file cache meanwhile. */ but it can be evicted from the file cache meanwhile. */
posix_fadvise(fd, ofs, sizeof *buf, POSIX_FADV_DONTNEED); posix_fadvise(fd, ofs, buf_len, POSIX_FADV_DONTNEED);
#endif /* POSIX_FADV_DONTNEED */ #endif /* POSIX_FADV_DONTNEED */
return(UNIV_LIKELY(ret)); return(UNIV_LIKELY(ret));