mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
07dcc80023
This bug may manifest itself not only with the queries for which the index-merge access method is chosen. It also may display itself for queries with DISTINCT. The bug was in how the Unique::get method used the merge_buffers function. To compare elements in the the queue employed by merge_buffers() it must use the buffpek_compare function rather than the function for binary comparison. mysql-test/r/innodb_mysql.result: Added a test case for bug #25798. mysql-test/t/innodb_mysql.test: Added a test case for bug #25798. sql/filesort.cc: Fixed bug #25798. The function merge_buffers() when called from the Uniques::get method must use function buffpek_compare to compare elements in the queue it employs. The pointer to buffpek_compare and the info for the function that compares sorted records are passed to merge_buffers through certain designated fields of the SORTPARAM structure. sql/sql_sort.h: Fixed bug #25798. Added fields to the SORTPARAM structure to be used in the function merge_buffers when called by the Uniques::get method. sql/uniques.cc: Fixed bug 25798. The function merge_buffers() when called from the Uniques::get method must use function buffpek_compare to compare elements in the queue it employes.
89 lines
3.5 KiB
C
89 lines
3.5 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Defines used by filesort and uniques */
|
|
|
|
#define MERGEBUFF 7
|
|
#define MERGEBUFF2 15
|
|
|
|
/*
|
|
The structure SORT_ADDON_FIELD describes a fixed layout
|
|
for field values appended to sorted values in records to be sorted
|
|
in the sort buffer.
|
|
Only fixed layout is supported now.
|
|
Null bit maps for the appended values is placed before the values
|
|
themselves. Offsets are from the last sorted field, that is from the
|
|
record referefence, which is still last component of sorted records.
|
|
It is preserved for backward compatiblility.
|
|
The structure is used tp store values of the additional fields
|
|
in the sort buffer. It is used also when these values are read
|
|
from a temporary file/buffer. As the reading procedures are beyond the
|
|
scope of the 'filesort' code the values have to be retrieved via
|
|
the callback function 'unpack_addon_fields'.
|
|
*/
|
|
|
|
typedef struct st_sort_addon_field { /* Sort addon packed field */
|
|
Field *field; /* Original field */
|
|
uint offset; /* Offset from the last sorted field */
|
|
uint null_offset; /* Offset to to null bit from the last sorted field */
|
|
uint length; /* Length in the sort buffer */
|
|
uint8 null_bit; /* Null bit mask for the field */
|
|
} SORT_ADDON_FIELD;
|
|
|
|
typedef struct st_buffpek { /* Struktur om sorteringsbuffrarna */
|
|
my_off_t file_pos; /* Where we are in the sort file */
|
|
uchar *base,*key; /* key pointers */
|
|
ha_rows count; /* Number of rows in table */
|
|
ulong mem_count; /* numbers of keys in memory */
|
|
ulong max_keys; /* Max keys in buffert */
|
|
} BUFFPEK;
|
|
|
|
struct BUFFPEK_COMPARE_CONTEXT
|
|
{
|
|
qsort_cmp2 key_compare;
|
|
void *key_compare_arg;
|
|
};
|
|
|
|
typedef struct st_sort_param {
|
|
uint rec_length; /* Length of sorted records */
|
|
uint sort_length; /* Length of sorted columns */
|
|
uint ref_length; /* Length of record ref. */
|
|
uint addon_length; /* Length of added packed fields */
|
|
uint res_length; /* Length of records in final sorted file/buffer */
|
|
uint keys; /* Max keys / buffer */
|
|
ha_rows max_rows,examined_rows;
|
|
TABLE *sort_form; /* For quicker make_sortkey */
|
|
SORT_FIELD *local_sortorder;
|
|
SORT_FIELD *end;
|
|
SORT_ADDON_FIELD *addon_field; /* Descriptors for companion fields */
|
|
uchar *unique_buff;
|
|
bool not_killable;
|
|
char* tmp_buffer;
|
|
/* The fields below are used only by Unique class */
|
|
qsort2_cmp compare;
|
|
BUFFPEK_COMPARE_CONTEXT cmp_context;
|
|
} SORTPARAM;
|
|
|
|
|
|
int merge_many_buff(SORTPARAM *param, uchar *sort_buffer,
|
|
BUFFPEK *buffpek,
|
|
uint *maxbuffer, IO_CACHE *t_file);
|
|
uint read_to_buffer(IO_CACHE *fromfile,BUFFPEK *buffpek,
|
|
uint sort_length);
|
|
int merge_buffers(SORTPARAM *param,IO_CACHE *from_file,
|
|
IO_CACHE *to_file, uchar *sort_buffer,
|
|
BUFFPEK *lastbuff,BUFFPEK *Fb,
|
|
BUFFPEK *Tb,int flag);
|
|
void reuse_freed_buff(QUEUE *queue, BUFFPEK *reuse, uint key_length);
|