database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 5.3 -> 5.3-subqueries-mwl90

Browse Source
This commit is contained in:
Sergey Petrunya
2011-03-01 13:21:48 +03:00
parent b8f00542e2 c6ba959802
commit cb147b3965
359 changed files with 27404 additions and 2224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sql/sql_join_cache.h
View File

@ -219,13 +219,13 @@ protected:
The expected length of a record in the join buffer together with
all prefixes and postfixes
*/
ulong avg_record_length;
size_t avg_record_length;
/* The expected size of the space per record in the auxiliary buffer */
ulong avg_aux_buffer_incr;
size_t avg_aux_buffer_incr;
/* Expected join buffer space used for one record */
ulong space_per_record;
size_t space_per_record;
/* Pointer to the beginning of the join buffer */
uchar *buff;
@ -233,26 +233,26 @@ protected:
Size of the entire memory allocated for the join buffer.
Part of this memory may be reserved for the auxiliary buffer.
*/
ulong buff_size;
size_t buff_size;
/* The minimal join buffer size when join buffer still makes sense to use */
ulong min_buff_size;
size_t min_buff_size;
/* The maximum expected size if the join buffer to be used */
ulong max_buff_size;
size_t max_buff_size;
/* Size of the auxiliary buffer */
ulong aux_buff_size;
size_t aux_buff_size;
/* The number of records put into the join buffer */
ulong records;
size_t records;
/*
The number of records in the fully refilled join buffer of
the minimal size equal to min_buff_size
*/
ulong min_records;
size_t min_records;
/*
The maximum expected number of records to be put in the join buffer
at one refill
*/
ulong max_records;
size_t max_records;
/*
Pointer to the current position in the join buffer.
@ -401,7 +401,7 @@ protected:
virtual uint aux_buffer_incr(ulong recno);
/* Shall calculate how much space is remaining in the join buffer */
virtual ulong rem_space()
virtual size_t rem_space()
{
return max(buff_size-(end_pos-buff)-aux_buff_size,0);
}
@ -579,9 +579,9 @@ public:
virtual int init();
/* Get the current size of the cache join buffer */
ulong get_join_buffer_size() { return buff_size; }
size_t get_join_buffer_size() { return buff_size; }
/* Set the size of the cache join buffer to a new value */
void set_join_buffer_size(ulong sz) { buff_size= sz; }
void set_join_buffer_size(size_t sz) { buff_size= sz; }
/* Get the minimum possible size of the cache join buffer */
virtual ulong get_min_join_buffer_size();
@ -924,7 +924,7 @@ protected:
Calculate how much space in the buffer would not be occupied by
records, key entries and additional memory for the MMR buffer.
*/
ulong rem_space()
size_t rem_space()
{
return max(last_key_entry-end_pos-aux_buff_size,0);
}
@ -1262,7 +1262,7 @@ protected:
Get the number of ranges in the cache buffer passed to the MRR
interface. For each record its own range is passed.
*/
uint get_number_of_ranges_for_mrr() { return records; }
uint get_number_of_ranges_for_mrr() { return (uint)records; }
/*
Setup the MRR buffer as the space between the last record put