2005-07-18 13:31:02 +02:00
|
|
|
/* Copyright (C) 2000, 2005 MySQL AB
|
2001-12-06 13:10:51 +01:00
|
|
|
|
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2001-12-06 13:10:51 +01:00
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
2000-07-31 21:29:14 +02:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2001-12-06 13:10:51 +01:00
|
|
|
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 */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Code for generell handling of priority Queues.
|
|
|
|
Implemention of queues from "Algoritms in C" by Robert Sedgewick.
|
2005-07-18 13:31:02 +02:00
|
|
|
An optimisation of _downheap suggested in Exercise 7.51 in "Data
|
|
|
|
Structures & Algorithms in C++" by Mark Allen Weiss, Second Edition
|
2005-12-12 21:19:19 +01:00
|
|
|
was implemented by Mikael Ronstrom 2005. Also the O(N) algorithm
|
2005-07-18 13:31:02 +02:00
|
|
|
of queue_fix was implemented.
|
2000-07-31 21:29:14 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "mysys_priv.h"
|
2000-08-14 13:27:19 +02:00
|
|
|
#include "mysys_err.h"
|
2000-07-31 21:29:14 +02:00
|
|
|
#include <queues.h>
|
|
|
|
|
|
|
|
|
2003-01-18 18:31:38 +01:00
|
|
|
/*
|
|
|
|
Init queue
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
init_queue()
|
|
|
|
queue Queue to initialise
|
|
|
|
max_elements Max elements that will be put in queue
|
|
|
|
offset_to_key Offset to key in element stored in queue
|
|
|
|
Used when sending pointers to compare function
|
|
|
|
max_at_top Set to 1 if you want biggest element on top.
|
|
|
|
compare Compare function for elements, takes 3 arguments.
|
|
|
|
first_cmp_arg First argument to compare function
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
Will allocate max_element pointers for queue array
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
1 Could not allocate memory
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
int init_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
pbool max_at_top, int (*compare) (void *, uchar *, uchar *),
|
2000-07-31 21:29:14 +02:00
|
|
|
void *first_cmp_arg)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("init_queue");
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if ((queue->root= (uchar **) my_malloc((max_elements+1)*sizeof(void*),
|
2000-07-31 21:29:14 +02:00
|
|
|
MYF(MY_WME))) == 0)
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
queue->elements=0;
|
|
|
|
queue->compare=compare;
|
|
|
|
queue->first_cmp_arg=first_cmp_arg;
|
|
|
|
queue->max_elements=max_elements;
|
|
|
|
queue->offset_to_key=offset_to_key;
|
2007-11-14 19:20:31 +01:00
|
|
|
queue_set_max_at_top(queue, max_at_top);
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2003-01-18 18:31:38 +01:00
|
|
|
|
2005-12-12 21:19:19 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Init queue, uses init_queue internally for init work but also accepts
|
|
|
|
auto_extent as parameter
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
init_queue_ex()
|
|
|
|
queue Queue to initialise
|
|
|
|
max_elements Max elements that will be put in queue
|
|
|
|
offset_to_key Offset to key in element stored in queue
|
|
|
|
Used when sending pointers to compare function
|
|
|
|
max_at_top Set to 1 if you want biggest element on top.
|
|
|
|
compare Compare function for elements, takes 3 arguments.
|
|
|
|
first_cmp_arg First argument to compare function
|
|
|
|
auto_extent When the queue is full and there is insert operation
|
|
|
|
extend the queue.
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
Will allocate max_element pointers for queue array
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
1 Could not allocate memory
|
|
|
|
*/
|
|
|
|
|
|
|
|
int init_queue_ex(QUEUE *queue, uint max_elements, uint offset_to_key,
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
pbool max_at_top, int (*compare) (void *, uchar *, uchar *),
|
2005-12-12 21:19:19 +01:00
|
|
|
void *first_cmp_arg, uint auto_extent)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
DBUG_ENTER("init_queue_ex");
|
|
|
|
|
|
|
|
if ((ret= init_queue(queue, max_elements, offset_to_key, max_at_top, compare,
|
|
|
|
first_cmp_arg)))
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
|
|
|
queue->auto_extent= auto_extent;
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2000-09-14 01:39:07 +02:00
|
|
|
/*
|
2003-10-16 02:08:40 +02:00
|
|
|
Reinitialize queue for other usage
|
2003-01-18 18:31:38 +01:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
reinit_queue()
|
|
|
|
queue Queue to initialise
|
|
|
|
max_elements Max elements that will be put in queue
|
|
|
|
offset_to_key Offset to key in element stored in queue
|
|
|
|
Used when sending pointers to compare function
|
|
|
|
max_at_top Set to 1 if you want biggest element on top.
|
|
|
|
compare Compare function for elements, takes 3 arguments.
|
|
|
|
first_cmp_arg First argument to compare function
|
|
|
|
|
|
|
|
NOTES
|
2003-10-16 02:08:40 +02:00
|
|
|
This will delete all elements from the queue. If you don't want this,
|
|
|
|
use resize_queue() instead.
|
2003-01-18 18:31:38 +01:00
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
EE_OUTOFMEMORY Wrong max_elements
|
2000-09-14 01:39:07 +02:00
|
|
|
*/
|
|
|
|
|
2000-08-14 13:27:19 +02:00
|
|
|
int reinit_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
pbool max_at_top, int (*compare) (void *, uchar *, uchar *),
|
2003-01-18 18:31:38 +01:00
|
|
|
void *first_cmp_arg)
|
2000-08-14 13:27:19 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("reinit_queue");
|
|
|
|
queue->elements=0;
|
|
|
|
queue->compare=compare;
|
|
|
|
queue->first_cmp_arg=first_cmp_arg;
|
|
|
|
queue->offset_to_key=offset_to_key;
|
2007-11-14 19:20:31 +01:00
|
|
|
queue_set_max_at_top(queue, max_at_top);
|
2003-10-06 14:11:16 +02:00
|
|
|
resize_queue(queue, max_elements);
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2003-10-15 15:55:24 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Resize queue
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
resize_queue()
|
|
|
|
queue Queue
|
|
|
|
max_elements New max size for queue
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
If you resize queue to be less than the elements you have in it,
|
|
|
|
the extra elements will be deleted
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
1 Error. In this case the queue is unchanged
|
|
|
|
*/
|
|
|
|
|
2003-10-06 14:11:16 +02:00
|
|
|
int resize_queue(QUEUE *queue, uint max_elements)
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar **new_root;
|
2003-10-06 14:11:16 +02:00
|
|
|
DBUG_ENTER("resize_queue");
|
|
|
|
if (queue->max_elements == max_elements)
|
|
|
|
DBUG_RETURN(0);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if ((new_root= (uchar **) my_realloc((void *)queue->root,
|
2003-10-15 15:55:24 +02:00
|
|
|
(max_elements+1)*sizeof(void*),
|
|
|
|
MYF(MY_WME))) == 0)
|
2003-10-06 14:11:16 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
set_if_smaller(queue->elements, max_elements);
|
2003-10-15 15:55:24 +02:00
|
|
|
queue->max_elements= max_elements;
|
|
|
|
queue->root= new_root;
|
2000-08-14 13:27:19 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2003-01-18 18:31:38 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Delete queue
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
delete_queue()
|
|
|
|
queue Queue to delete
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
Just free allocated memory.
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
Can be called safely multiple times
|
|
|
|
*/
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
void delete_queue(QUEUE *queue)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("delete_queue");
|
|
|
|
if (queue->root)
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*) queue->root,MYF(0));
|
2000-07-31 21:29:14 +02:00
|
|
|
queue->root=0;
|
|
|
|
}
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Code for insert, search and delete of elements */
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
void queue_insert(register QUEUE *queue, uchar *element)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2006-09-28 19:10:06 +02:00
|
|
|
reg2 uint idx, next;
|
|
|
|
DBUG_ASSERT(queue->elements < queue->max_elements);
|
|
|
|
queue->root[0]= element;
|
|
|
|
idx= ++queue->elements;
|
|
|
|
/* max_at_top swaps the comparison if we want to order by desc */
|
2007-11-14 19:20:31 +01:00
|
|
|
while ((queue->compare(queue->first_cmp_arg,
|
|
|
|
element + queue->offset_to_key,
|
|
|
|
queue->root[(next= idx >> 1)] +
|
|
|
|
queue->offset_to_key) * queue->max_at_top) < 0)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2006-09-28 19:10:06 +02:00
|
|
|
queue->root[idx]= queue->root[next];
|
|
|
|
idx= next;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2006-09-28 19:10:06 +02:00
|
|
|
queue->root[idx]= element;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2005-12-12 21:19:19 +01:00
|
|
|
/*
|
|
|
|
Does safe insert. If no more space left on the queue resize it.
|
|
|
|
Return codes:
|
|
|
|
0 - OK
|
|
|
|
1 - Cannot allocate more memory
|
|
|
|
2 - auto_extend is 0, the operation would
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
int queue_insert_safe(register QUEUE *queue, uchar *element)
|
2005-12-12 21:19:19 +01:00
|
|
|
{
|
|
|
|
|
|
|
|
if (queue->elements == queue->max_elements)
|
|
|
|
{
|
|
|
|
if (!queue->auto_extent)
|
|
|
|
return 2;
|
|
|
|
else if (resize_queue(queue, queue->max_elements + queue->auto_extent))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
queue_insert(queue, element);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
/* Remove item from queue */
|
|
|
|
/* Returns pointer to removed element */
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar *queue_remove(register QUEUE *queue, uint idx)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar *element;
|
2006-09-28 19:10:06 +02:00
|
|
|
DBUG_ASSERT(idx < queue->max_elements);
|
|
|
|
element= queue->root[++idx]; /* Intern index starts from 1 */
|
|
|
|
queue->root[idx]= queue->root[queue->elements--];
|
|
|
|
_downheap(queue, idx);
|
|
|
|
return element;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Fix when element on top has been replaced */
|
|
|
|
|
|
|
|
#ifndef queue_replaced
|
2003-01-18 18:31:38 +01:00
|
|
|
void queue_replaced(QUEUE *queue)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
_downheap(queue,1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-07-18 13:31:02 +02:00
|
|
|
#ifndef OLD_VERSION
|
|
|
|
|
|
|
|
void _downheap(register QUEUE *queue, uint idx)
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar *element;
|
2005-07-18 13:31:02 +02:00
|
|
|
uint elements,half_queue,offset_to_key, next_index;
|
2008-02-18 23:29:39 +01:00
|
|
|
my_bool first= TRUE;
|
2005-07-18 13:31:02 +02:00
|
|
|
uint start_idx= idx;
|
|
|
|
|
|
|
|
offset_to_key=queue->offset_to_key;
|
|
|
|
element=queue->root[idx];
|
|
|
|
half_queue=(elements=queue->elements) >> 1;
|
|
|
|
|
|
|
|
while (idx <= half_queue)
|
|
|
|
{
|
|
|
|
next_index=idx+idx;
|
|
|
|
if (next_index < elements &&
|
|
|
|
(queue->compare(queue->first_cmp_arg,
|
|
|
|
queue->root[next_index]+offset_to_key,
|
2007-11-14 19:20:31 +01:00
|
|
|
queue->root[next_index+1]+offset_to_key) *
|
2005-07-18 13:31:02 +02:00
|
|
|
queue->max_at_top) > 0)
|
|
|
|
next_index++;
|
|
|
|
if (first &&
|
2007-11-14 19:20:31 +01:00
|
|
|
(((queue->compare(queue->first_cmp_arg,
|
|
|
|
queue->root[next_index]+offset_to_key,
|
|
|
|
element+offset_to_key) * queue->max_at_top) >= 0)))
|
2005-07-18 13:31:02 +02:00
|
|
|
{
|
|
|
|
queue->root[idx]= element;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
queue->root[idx]=queue->root[next_index];
|
|
|
|
idx=next_index;
|
|
|
|
first= FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
next_index= idx >> 1;
|
|
|
|
while (next_index > start_idx)
|
|
|
|
{
|
|
|
|
if ((queue->compare(queue->first_cmp_arg,
|
|
|
|
queue->root[next_index]+offset_to_key,
|
2007-11-14 19:20:31 +01:00
|
|
|
element+offset_to_key) *
|
2005-07-18 13:31:02 +02:00
|
|
|
queue->max_at_top) < 0)
|
|
|
|
break;
|
|
|
|
queue->root[idx]=queue->root[next_index];
|
|
|
|
idx=next_index;
|
|
|
|
next_index= idx >> 1;
|
|
|
|
}
|
|
|
|
queue->root[idx]=element;
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2005-07-18 13:31:02 +02:00
|
|
|
#else
|
|
|
|
/*
|
|
|
|
The old _downheap version is kept for comparisons with the benchmark
|
|
|
|
suit or new benchmarks anyone wants to run for comparisons.
|
|
|
|
*/
|
|
|
|
/* Fix heap when index have changed */
|
2000-07-31 21:29:14 +02:00
|
|
|
void _downheap(register QUEUE *queue, uint idx)
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar *element;
|
2000-07-31 21:29:14 +02:00
|
|
|
uint elements,half_queue,next_index,offset_to_key;
|
|
|
|
|
|
|
|
offset_to_key=queue->offset_to_key;
|
|
|
|
element=queue->root[idx];
|
|
|
|
half_queue=(elements=queue->elements) >> 1;
|
|
|
|
|
|
|
|
while (idx <= half_queue)
|
|
|
|
{
|
|
|
|
next_index=idx+idx;
|
|
|
|
if (next_index < elements &&
|
|
|
|
(queue->compare(queue->first_cmp_arg,
|
|
|
|
queue->root[next_index]+offset_to_key,
|
2007-11-14 19:20:31 +01:00
|
|
|
queue->root[next_index+1]+offset_to_key) *
|
2000-07-31 21:29:14 +02:00
|
|
|
queue->max_at_top) > 0)
|
|
|
|
next_index++;
|
2007-11-14 19:20:31 +01:00
|
|
|
if ((queue->compare(queue->first_cmp_arg,
|
|
|
|
queue->root[next_index]+offset_to_key,
|
|
|
|
element+offset_to_key) * queue->max_at_top) >= 0)
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
|
|
|
queue->root[idx]=queue->root[next_index];
|
|
|
|
idx=next_index;
|
|
|
|
}
|
|
|
|
queue->root[idx]=element;
|
|
|
|
}
|
2001-11-06 16:17:31 +01:00
|
|
|
|
|
|
|
|
2005-07-18 13:31:02 +02:00
|
|
|
#endif
|
2001-11-06 16:17:31 +01:00
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
/*
|
2005-07-18 13:31:02 +02:00
|
|
|
Fix heap when every element was changed.
|
2001-12-10 12:59:11 +01:00
|
|
|
*/
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2001-11-06 16:17:31 +01:00
|
|
|
void queue_fix(QUEUE *queue)
|
|
|
|
{
|
2005-07-18 13:31:02 +02:00
|
|
|
uint i;
|
|
|
|
for (i= queue->elements >> 1; i > 0; i--)
|
|
|
|
_downheap(queue, i);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef MAIN
|
|
|
|
/*
|
|
|
|
A test program for the priority queue implementation.
|
|
|
|
It can also be used to benchmark changes of the implementation
|
|
|
|
Build by doing the following in the directory mysys
|
|
|
|
make test_priority_queue
|
|
|
|
./test_priority_queue
|
|
|
|
|
2007-10-18 12:32:43 +02:00
|
|
|
Written by Mikael Ronström, 2005
|
2005-07-18 13:31:02 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
static uint num_array[1025];
|
|
|
|
static uint tot_no_parts= 0;
|
|
|
|
static uint tot_no_loops= 0;
|
|
|
|
static uint expected_part= 0;
|
|
|
|
static uint expected_num= 0;
|
|
|
|
static bool max_ind= 0;
|
|
|
|
static bool fix_used= 0;
|
|
|
|
static ulonglong start_time= 0;
|
|
|
|
|
|
|
|
static bool is_divisible_by(uint num, uint divisor)
|
|
|
|
{
|
|
|
|
uint quotient= num / divisor;
|
|
|
|
if (quotient * divisor == num)
|
|
|
|
return TRUE;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void calculate_next()
|
|
|
|
{
|
|
|
|
uint part= expected_part, num= expected_num;
|
|
|
|
uint no_parts= tot_no_parts;
|
|
|
|
if (max_ind)
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
while (++part <= no_parts)
|
|
|
|
{
|
|
|
|
if (is_divisible_by(num, part) &&
|
|
|
|
(num <= ((1 << 21) + part)))
|
|
|
|
{
|
|
|
|
expected_part= part;
|
|
|
|
expected_num= num;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
part= 0;
|
|
|
|
} while (--num);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
while (--part > 0)
|
|
|
|
{
|
|
|
|
if (is_divisible_by(num, part))
|
|
|
|
{
|
|
|
|
expected_part= part;
|
|
|
|
expected_num= num;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
part= no_parts + 1;
|
|
|
|
} while (++num);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void calculate_end_next(uint part)
|
|
|
|
{
|
|
|
|
uint no_parts= tot_no_parts, num;
|
|
|
|
num_array[part]= 0;
|
|
|
|
if (max_ind)
|
|
|
|
{
|
|
|
|
expected_num= 0;
|
|
|
|
for (part= no_parts; part > 0 ; part--)
|
|
|
|
{
|
|
|
|
if (num_array[part])
|
|
|
|
{
|
|
|
|
num= num_array[part] & 0x3FFFFF;
|
|
|
|
if (num >= expected_num)
|
|
|
|
{
|
|
|
|
expected_num= num;
|
|
|
|
expected_part= part;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (expected_num == 0)
|
|
|
|
expected_part= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
expected_num= 0xFFFFFFFF;
|
|
|
|
for (part= 1; part <= no_parts; part++)
|
|
|
|
{
|
|
|
|
if (num_array[part])
|
|
|
|
{
|
|
|
|
num= num_array[part] & 0x3FFFFF;
|
|
|
|
if (num <= expected_num)
|
|
|
|
{
|
|
|
|
expected_num= num;
|
|
|
|
expected_part= part;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (expected_num == 0xFFFFFFFF)
|
|
|
|
expected_part= 0;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int test_compare(void *null_arg, uchar *a, uchar *b)
|
2005-07-18 13:31:02 +02:00
|
|
|
{
|
|
|
|
uint a_num= (*(uint*)a) & 0x3FFFFF;
|
|
|
|
uint b_num= (*(uint*)b) & 0x3FFFFF;
|
|
|
|
uint a_part, b_part;
|
|
|
|
if (a_num > b_num)
|
|
|
|
return +1;
|
|
|
|
if (a_num < b_num)
|
|
|
|
return -1;
|
|
|
|
a_part= (*(uint*)a) >> 22;
|
|
|
|
b_part= (*(uint*)b) >> 22;
|
|
|
|
if (a_part < b_part)
|
|
|
|
return +1;
|
|
|
|
if (a_part > b_part)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool check_num(uint num_part)
|
|
|
|
{
|
|
|
|
uint part= num_part >> 22;
|
|
|
|
uint num= num_part & 0x3FFFFF;
|
|
|
|
if (part == expected_part)
|
|
|
|
if (num == expected_num)
|
|
|
|
return FALSE;
|
|
|
|
printf("Expect part %u Expect num 0x%x got part %u num 0x%x max_ind %u fix_used %u \n",
|
|
|
|
expected_part, expected_num, part, num, max_ind, fix_used);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void perform_insert(QUEUE *queue)
|
|
|
|
{
|
|
|
|
uint i= 1, no_parts= tot_no_parts;
|
|
|
|
uint backward_start= 0;
|
|
|
|
|
|
|
|
expected_part= 1;
|
|
|
|
expected_num= 1;
|
|
|
|
|
|
|
|
if (max_ind)
|
|
|
|
backward_start= 1 << 21;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
uint num= (i + backward_start);
|
|
|
|
if (max_ind)
|
|
|
|
{
|
|
|
|
while (!is_divisible_by(num, i))
|
|
|
|
num--;
|
|
|
|
if (max_ind && (num > expected_num ||
|
|
|
|
(num == expected_num && i < expected_part)))
|
|
|
|
{
|
|
|
|
expected_num= num;
|
|
|
|
expected_part= i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
num_array[i]= num + (i << 22);
|
|
|
|
if (fix_used)
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
queue_element(queue, i-1)= (uchar*)&num_array[i];
|
2005-07-18 13:31:02 +02:00
|
|
|
else
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
queue_insert(queue, (uchar*)&num_array[i]);
|
2005-07-18 13:31:02 +02:00
|
|
|
} while (++i <= no_parts);
|
|
|
|
if (fix_used)
|
|
|
|
{
|
|
|
|
queue->elements= no_parts;
|
|
|
|
queue_fix(queue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool perform_ins_del(QUEUE *queue, bool max_ind)
|
|
|
|
{
|
|
|
|
uint i= 0, no_loops= tot_no_loops, j= tot_no_parts;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
uint num_part= *(uint*)queue_top(queue);
|
|
|
|
uint part= num_part >> 22;
|
|
|
|
if (check_num(num_part))
|
|
|
|
return TRUE;
|
|
|
|
if (j++ >= no_loops)
|
|
|
|
{
|
|
|
|
calculate_end_next(part);
|
|
|
|
queue_remove(queue, (uint) 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
calculate_next();
|
|
|
|
if (max_ind)
|
|
|
|
num_array[part]-= part;
|
|
|
|
else
|
|
|
|
num_array[part]+= part;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
queue_top(queue)= (uchar*)&num_array[part];
|
2005-07-18 13:31:02 +02:00
|
|
|
queue_replaced(queue);
|
|
|
|
}
|
|
|
|
} while (++i < no_loops);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool do_test(uint no_parts, uint l_max_ind, bool l_fix_used)
|
|
|
|
{
|
|
|
|
QUEUE queue;
|
|
|
|
bool result;
|
|
|
|
max_ind= l_max_ind;
|
|
|
|
fix_used= l_fix_used;
|
|
|
|
init_queue(&queue, no_parts, 0, max_ind, test_compare, NULL);
|
|
|
|
tot_no_parts= no_parts;
|
|
|
|
tot_no_loops= 1024;
|
|
|
|
perform_insert(&queue);
|
|
|
|
if ((result= perform_ins_del(&queue, max_ind)))
|
|
|
|
delete_queue(&queue);
|
|
|
|
if (result)
|
|
|
|
{
|
|
|
|
printf("Error\n");
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void start_measurement()
|
|
|
|
{
|
|
|
|
start_time= my_getsystime();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void stop_measurement()
|
|
|
|
{
|
|
|
|
ulonglong stop_time= my_getsystime();
|
|
|
|
uint time_in_micros;
|
|
|
|
stop_time-= start_time;
|
|
|
|
stop_time/= 10; /* Convert to microseconds */
|
|
|
|
time_in_micros= (uint)stop_time;
|
|
|
|
printf("Time expired is %u microseconds \n", time_in_micros);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void benchmark_test()
|
|
|
|
{
|
|
|
|
QUEUE queue_real;
|
|
|
|
QUEUE *queue= &queue_real;
|
|
|
|
uint i, add;
|
|
|
|
fix_used= TRUE;
|
|
|
|
max_ind= FALSE;
|
|
|
|
tot_no_parts= 1024;
|
|
|
|
init_queue(queue, tot_no_parts, 0, max_ind, test_compare, NULL);
|
|
|
|
/*
|
|
|
|
First benchmark whether queue_fix is faster than using queue_insert
|
|
|
|
for sizes of 16 partitions.
|
|
|
|
*/
|
|
|
|
for (tot_no_parts= 2, add=2; tot_no_parts < 128;
|
|
|
|
tot_no_parts+= add, add++)
|
|
|
|
{
|
|
|
|
printf("Start benchmark queue_fix, tot_no_parts= %u \n", tot_no_parts);
|
|
|
|
start_measurement();
|
|
|
|
for (i= 0; i < 128; i++)
|
|
|
|
{
|
|
|
|
perform_insert(queue);
|
|
|
|
queue_remove_all(queue);
|
|
|
|
}
|
|
|
|
stop_measurement();
|
|
|
|
|
|
|
|
fix_used= FALSE;
|
|
|
|
printf("Start benchmark queue_insert\n");
|
|
|
|
start_measurement();
|
|
|
|
for (i= 0; i < 128; i++)
|
|
|
|
{
|
|
|
|
perform_insert(queue);
|
|
|
|
queue_remove_all(queue);
|
|
|
|
}
|
|
|
|
stop_measurement();
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
Now benchmark insertion and deletion of 16400 elements.
|
|
|
|
Used in consecutive runs this shows whether the optimised _downheap
|
|
|
|
is faster than the standard implementation.
|
|
|
|
*/
|
|
|
|
printf("Start benchmarking _downheap \n");
|
|
|
|
start_measurement();
|
|
|
|
perform_insert(queue);
|
|
|
|
for (i= 0; i < 65536; i++)
|
|
|
|
{
|
|
|
|
uint num, part;
|
|
|
|
num= *(uint*)queue_top(queue);
|
|
|
|
num+= 16;
|
|
|
|
part= num >> 22;
|
|
|
|
num_array[part]= num;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
queue_top(queue)= (uchar*)&num_array[part];
|
2005-07-18 13:31:02 +02:00
|
|
|
queue_replaced(queue);
|
|
|
|
}
|
|
|
|
for (i= 0; i < 16; i++)
|
|
|
|
queue_remove(queue, (uint) 0);
|
|
|
|
queue_remove_all(queue);
|
|
|
|
stop_measurement();
|
|
|
|
}
|
|
|
|
|
|
|
|
int main()
|
|
|
|
{
|
|
|
|
int i, add= 1;
|
|
|
|
for (i= 1; i < 1024; i+=add, add++)
|
|
|
|
{
|
|
|
|
printf("Start test for priority queue of size %u\n", i);
|
|
|
|
if (do_test(i, 0, 1))
|
|
|
|
return -1;
|
|
|
|
if (do_test(i, 1, 1))
|
|
|
|
return -1;
|
|
|
|
if (do_test(i, 0, 0))
|
|
|
|
return -1;
|
|
|
|
if (do_test(i, 1, 0))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
benchmark_test();
|
|
|
|
printf("OK\n");
|
|
|
|
return 0;
|
2001-11-06 16:17:31 +01:00
|
|
|
}
|
2005-07-18 13:31:02 +02:00
|
|
|
#endif
|