database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix a number of problems with reverse buffer use

Browse Source
This commit is contained in:
Sergey Petrunya
2010-08-12 23:59:29 +04:00
parent 8d07c16ad9
commit d098596ba5
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/multi_range_read.cc
View File

@ -644,6 +644,8 @@ int DsMrr_impl::dsmrr_fill_rowid_buffer()
rowid_buffer.reset_for_writing(); rowid_buffer.reset_for_writing();
identical_rowid_ptr= NULL; identical_rowid_ptr= NULL;
if (do_sort_keys)
key_buffer.flip();
while (rowid_buffer.have_space_for(rowid_buff_elem_size)) while (rowid_buffer.have_space_for(rowid_buff_elem_size))
{ {
@ -860,13 +862,16 @@ void DsMrr_impl::dsmrr_fill_key_buffer()
setup_buffer_sizes(&cur_range.start_key); setup_buffer_sizes(&cur_range.start_key);
} }
if (key_buffer.is_reverse() && is_mrr_assoc)
key_buffer.write((uchar*)&cur_range.ptr, sizeof(void*));
/* Put key, or {key, range_id} pair into the buffer */ /* Put key, or {key, range_id} pair into the buffer */
if (use_key_pointers) if (use_key_pointers)
key_buffer.write((uchar*)&cur_range.start_key.key, sizeof(char*)); key_buffer.write((uchar*)&cur_range.start_key.key, sizeof(char*));
else else
key_buffer.write(cur_range.start_key.key, key_tuple_length); key_buffer.write(cur_range.start_key.key, key_tuple_length);
if (is_mrr_assoc) if (!key_buffer.is_reverse() && is_mrr_assoc)
key_buffer.write((uchar*)&cur_range.ptr, sizeof(void*)); key_buffer.write((uchar*)&cur_range.ptr, sizeof(void*));
} }
@ -966,7 +971,6 @@ check_record:
} }
goto check_record; goto check_record;
// goto read_and_check;
} }
while(1) while(1)
@ -999,7 +1003,8 @@ check_record:
res= HA_ERR_END_OF_FILE; res= HA_ERR_END_OF_FILE;
goto end; goto end;
} }
dsmrr_fill_key_buffer(); if (!do_rowid_fetch)
dsmrr_fill_key_buffer();
if (!key_buffer.have_data(key_buff_elem_size)) if (!key_buffer.have_data(key_buff_elem_size))
{ {
res= HA_ERR_END_OF_FILE; res= HA_ERR_END_OF_FILE;

15
sql/multi_range_read.h
View File

@ -102,14 +102,25 @@ public:
{ {
*unused_start= start; *unused_start= start;
*unused_end= read_pos; *unused_end= read_pos;
start= read_pos;
} }
else else
{ {
*unused_start=read_pos; *unused_start= read_pos;
*unused_end=end; *unused_end= end;
end= read_pos;
} }
} }
void flip()
{
uchar *tmp= read_pos;
read_pos= write_pos;
write_pos= tmp;
direction= -direction;
}
bool is_reverse() { return direction == -1; }
void grow(uchar *unused_start, uchar *unused_end) void grow(uchar *unused_start, uchar *unused_end)
{ {
/* /*