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

always use my_b_pread() instead of mysql_file_pread()

Browse Source 
when working with IO_CACHE's, don't access IO_CACHE::file directly
This commit is contained in:
Sergei Golubchik 2015-05-26 22:09:40 +02:00
parent 6309a30dc9
commit 318c826e93
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/my_sys.h
View File

@ -610,6 +610,7 @@ static inline size_t my_b_bytes_in_cache(const IO_CACHE *info)
int my_b_copy_to_file(IO_CACHE *cache, FILE *file); int my_b_copy_to_file(IO_CACHE *cache, FILE *file);
my_off_t my_b_append_tell(IO_CACHE* info); my_off_t my_b_append_tell(IO_CACHE* info);
my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */ my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */
int my_b_pread(IO_CACHE *info, uchar *Buffer, size_t Count, my_off_t pos);
typedef uint32 ha_checksum; typedef uint32 ha_checksum;
extern ulong my_crc_dbug_check; extern ulong my_crc_dbug_check;

6
mysys/mf_iocache2.c
View File

@ -180,6 +180,12 @@ void my_b_seek(IO_CACHE *info,my_off_t pos)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
int my_b_pread(IO_CACHE *info, uchar *Buffer, size_t Count, my_off_t pos)
{
if (mysql_file_pread(info->file, Buffer, Count, pos, info->myflags | MY_NABP))
return info->error= -1;
return 0;
}
/* /*
Read a string ended by '\n' into a buffer of 'max_length' size. Read a string ended by '\n' into a buffer of 'max_length' size.

7
sql/filesort.cc
View File

@ -1483,10 +1483,9 @@ uint read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
if ((count=(uint) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count))) if ((count=(uint) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count)))
{ {
if (mysql_file_pread(fromfile->file, (uchar*) buffpek->base, if (my_b_pread(fromfile, (uchar*) buffpek->base,
(length= rec_length*count), (length= rec_length*count), buffpek->file_pos))
buffpek->file_pos, MYF_RW)) return ((uint) -1);
return((uint) -1); /* purecov: inspected */
buffpek->key=buffpek->base; buffpek->key=buffpek->base;
buffpek->file_pos+= length; /* New filepos */ buffpek->file_pos+= length; /* New filepos */
buffpek->count-= count; buffpek->count-= count;

13
storage/maria/ma_sort.c
View File

@ -929,9 +929,8 @@ static my_off_t read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
if ((count= (ha_keys) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count))) if ((count= (ha_keys) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count)))
{ {
if (mysql_file_pread(fromfile->file, (uchar*) buffpek->base, if (my_b_pread(fromfile, (uchar*) buffpek->base,
(length= sort_length * count), (length= sort_length * count), buffpek->file_pos))
buffpek->file_pos, MYF_RW))
return(HA_OFFSET_ERROR); /* purecov: inspected */ return(HA_OFFSET_ERROR); /* purecov: inspected */
buffpek->key=buffpek->base; buffpek->key=buffpek->base;
buffpek->file_pos+= length; /* New filepos */ buffpek->file_pos+= length; /* New filepos */
@ -956,12 +955,12 @@ static my_off_t read_to_buffer_varlen(IO_CACHE *fromfile, BUFFPEK *buffpek,
for (idx=1;idx<=count;idx++) for (idx=1;idx<=count;idx++)
{ {
uint16 length_of_key; uint16 length_of_key;
if (mysql_file_pread(fromfile->file,(uchar*)&length_of_key,sizeof(length_of_key), if (my_b_pread(fromfile, (uchar*)&length_of_key,
buffpek->file_pos,MYF_RW)) sizeof(length_of_key), buffpek->file_pos))
return(HA_OFFSET_ERROR); return(HA_OFFSET_ERROR);
buffpek->file_pos+=sizeof(length_of_key); buffpek->file_pos+=sizeof(length_of_key);
if (mysql_file_pread(fromfile->file, buffp, length_of_key, if (my_b_pread(fromfile, (uchar*) buffp,
buffpek->file_pos,MYF_RW)) length_of_key, buffpek->file_pos))
return((uint) -1); return((uint) -1);
buffpek->file_pos+=length_of_key; buffpek->file_pos+=length_of_key;
buffp = buffp + sort_length; buffp = buffp + sort_length;

15
storage/myisam/sort.c
View File

@ -876,10 +876,9 @@ static my_off_t read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
if ((count= (ha_keys) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count))) if ((count= (ha_keys) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count)))
{ {
if (mysql_file_pread(fromfile->file, (uchar*) buffpek->base, if (my_b_pread(fromfile, (uchar*) buffpek->base,
(length= sort_length * count), (length= sort_length * count), buffpek->file_pos))
buffpek->file_pos, MYF_RW)) return(HA_OFFSET_ERROR);
return(HA_OFFSET_ERROR); /* purecov: inspected */
buffpek->key=buffpek->base; buffpek->key=buffpek->base;
buffpek->file_pos+= length; /* New filepos */ buffpek->file_pos+= length; /* New filepos */
buffpek->count-= count; buffpek->count-= count;
@ -903,12 +902,12 @@ static my_off_t read_to_buffer_varlen(IO_CACHE *fromfile, BUFFPEK *buffpek,
for (idx=1;idx<=count;idx++) for (idx=1;idx<=count;idx++)
{ {
if (mysql_file_pread(fromfile->file, (uchar*)&length_of_key, if (my_b_pread(fromfile, (uchar*)&length_of_key,
sizeof(length_of_key), buffpek->file_pos, MYF_RW)) sizeof(length_of_key), buffpek->file_pos))
return(HA_OFFSET_ERROR); return(HA_OFFSET_ERROR);
buffpek->file_pos+=sizeof(length_of_key); buffpek->file_pos+=sizeof(length_of_key);
if (mysql_file_pread(fromfile->file, (uchar*) buffp, if (my_b_pread(fromfile, (uchar*) buffp,
length_of_key, buffpek->file_pos, MYF_RW)) length_of_key, buffpek->file_pos))
return(HA_OFFSET_ERROR); return(HA_OFFSET_ERROR);
buffpek->file_pos+=length_of_key; buffpek->file_pos+=length_of_key;
buffp = buffp + sort_length; buffp = buffp + sort_length;