2003-07-03 16:01:31 +02:00
|
|
|
/* Copyright (C) 2002 MySQL AB
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2003-07-03 16:01:31 +02:00
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
2005-06-05 16:20:22 +02:00
|
|
|
#include "mysql_priv.h"
|
2005-05-27 12:03:37 +02:00
|
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
2003-07-03 16:01:31 +02:00
|
|
|
#pragma implementation
|
|
|
|
#endif
|
|
|
|
#include "sp_cache.h"
|
|
|
|
#include "sp_head.h"
|
|
|
|
|
2003-10-21 12:08:35 +02:00
|
|
|
static pthread_mutex_t Cversion_lock;
|
2005-08-11 15:43:22 +02:00
|
|
|
static ulong volatile Cversion= 0;
|
2003-10-21 12:08:35 +02:00
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Cache of stored routines.
|
|
|
|
*/
|
|
|
|
|
|
|
|
class sp_cache
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
ulong version;
|
|
|
|
|
|
|
|
sp_cache();
|
|
|
|
~sp_cache();
|
|
|
|
|
|
|
|
inline void insert(sp_head *sp)
|
|
|
|
{
|
|
|
|
/* TODO: why don't we check return value? */
|
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_hash_insert(&m_hashtable, (const uchar *)sp);
|
2005-08-09 01:23:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
inline sp_head *lookup(char *name, uint namelen)
|
|
|
|
{
|
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
|
|
|
return (sp_head *)hash_search(&m_hashtable, (const uchar *)name, namelen);
|
2005-08-09 01:23:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef NOT_USED
|
|
|
|
inline bool remove(char *name, uint namelen)
|
|
|
|
{
|
|
|
|
sp_head *sp= lookup(name, namelen);
|
|
|
|
if (sp)
|
|
|
|
{
|
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
|
|
|
hash_delete(&m_hashtable, (uchar *)sp);
|
2005-08-09 01:23:34 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
inline void remove_all()
|
|
|
|
{
|
|
|
|
cleanup();
|
|
|
|
init();
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
void init();
|
|
|
|
void cleanup();
|
|
|
|
|
|
|
|
/* All routines in this cache */
|
|
|
|
HASH m_hashtable;
|
|
|
|
}; // class sp_cache
|
|
|
|
|
|
|
|
|
|
|
|
/* Initialize the SP caching once at startup */
|
|
|
|
|
|
|
|
void sp_cache_init()
|
2003-10-21 12:08:35 +02:00
|
|
|
{
|
|
|
|
pthread_mutex_init(&Cversion_lock, MY_MUTEX_INIT_FAST);
|
|
|
|
}
|
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Clear the cache *cp and set *cp to NULL.
|
2005-08-11 15:43:22 +02:00
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
SYNOPSIS
|
|
|
|
sp_cache_clear()
|
2005-08-11 15:43:22 +02:00
|
|
|
cp Pointer to cache to clear
|
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
NOTE
|
|
|
|
This function doesn't invalidate other caches.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void sp_cache_clear(sp_cache **cp)
|
2003-10-21 12:08:35 +02:00
|
|
|
{
|
|
|
|
sp_cache *c= *cp;
|
|
|
|
|
|
|
|
if (c)
|
|
|
|
{
|
|
|
|
delete c;
|
|
|
|
*cp= NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Insert a routine into the cache.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
sp_cache_insert()
|
2005-08-11 15:43:22 +02:00
|
|
|
cp The cache to put routine into
|
|
|
|
sp Routine to insert.
|
2005-08-09 12:09:11 +02:00
|
|
|
|
|
|
|
TODO: Perhaps it will be more straightforward if in case we returned an
|
|
|
|
error from this function when we couldn't allocate sp_cache. (right
|
|
|
|
now failure to put routine into cache will cause a 'SP not found'
|
|
|
|
error to be reported at some later time)
|
2005-08-09 01:23:34 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
void sp_cache_insert(sp_cache **cp, sp_head *sp)
|
2003-10-21 12:08:35 +02:00
|
|
|
{
|
2005-08-11 15:43:22 +02:00
|
|
|
sp_cache *c;
|
2003-10-21 12:08:35 +02:00
|
|
|
|
2005-08-11 15:43:22 +02:00
|
|
|
if (!(c= *cp))
|
2005-08-09 01:23:34 +02:00
|
|
|
{
|
2005-08-11 14:58:15 +02:00
|
|
|
if (!(c= new sp_cache()))
|
|
|
|
return; // End of memory error
|
2005-08-11 15:43:22 +02:00
|
|
|
c->version= Cversion; // No need to lock when reading long variable
|
2003-10-21 12:08:35 +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
|
|
|
DBUG_PRINT("info",("sp_cache: inserting: %.*s", (int) sp->m_qname.length,
|
2005-08-11 15:43:22 +02:00
|
|
|
sp->m_qname.str));
|
2005-08-11 14:58:15 +02:00
|
|
|
c->insert(sp);
|
|
|
|
*cp= c; // Update *cp if it was NULL
|
2003-10-21 12:08:35 +02:00
|
|
|
}
|
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Look up a routine in the cache.
|
|
|
|
SYNOPSIS
|
|
|
|
sp_cache_lookup()
|
|
|
|
cp Cache to look into
|
|
|
|
name Name of rutine to find
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
An obsolete (but not more obsolete then since last
|
|
|
|
sp_cache_flush_obsolete call) routine may be returned.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
The routine or
|
|
|
|
NULL if the routine not found.
|
|
|
|
*/
|
|
|
|
|
|
|
|
sp_head *sp_cache_lookup(sp_cache **cp, sp_name *name)
|
2003-10-21 12:08:35 +02:00
|
|
|
{
|
|
|
|
sp_cache *c= *cp;
|
|
|
|
if (! c)
|
|
|
|
return NULL;
|
2005-08-09 01:23:34 +02:00
|
|
|
return c->lookup(name->m_qname.str, name->m_qname.length);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Invalidate all routines in all caches.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
sp_cache_invalidate()
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
This is called when a VIEW definition is modifed. We can't destroy sp_head
|
|
|
|
objects here as one may modify VIEW definitions from prelocking-free SPs.
|
|
|
|
*/
|
2003-10-21 12:08:35 +02:00
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
void sp_cache_invalidate()
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("sp_cache: invalidating"));
|
2005-08-11 15:43:22 +02:00
|
|
|
thread_safe_increment(Cversion, &Cversion_lock);
|
2003-10-21 12:08:35 +02:00
|
|
|
}
|
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Remove out-of-date SPs from the cache.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
sp_cache_flush_obsolete()
|
|
|
|
cp Cache to flush
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
This invalidates pointers to sp_head objects this thread uses.
|
|
|
|
In practice that means 'dont call this function when inside SP'.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void sp_cache_flush_obsolete(sp_cache **cp)
|
2003-10-21 12:08:35 +02:00
|
|
|
{
|
|
|
|
sp_cache *c= *cp;
|
|
|
|
if (c)
|
|
|
|
{
|
|
|
|
ulong v;
|
2005-08-11 15:43:22 +02:00
|
|
|
v= Cversion; // No need to lock when reading long variable
|
2003-10-21 12:08:35 +02:00
|
|
|
if (c->version < v)
|
2005-08-09 01:23:34 +02:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("sp_cache: deleting all functions"));
|
|
|
|
/* We need to delete all elements. */
|
2003-10-21 12:08:35 +02:00
|
|
|
c->remove_all();
|
2005-08-09 01:23:34 +02:00
|
|
|
c->version= v;
|
|
|
|
}
|
2003-10-21 12:08:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-11 14:58:15 +02:00
|
|
|
|
2005-08-09 01:23:34 +02:00
|
|
|
/*************************************************************************
|
|
|
|
Internal functions
|
|
|
|
*************************************************************************/
|
2003-10-21 12:08:35 +02:00
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
extern "C" uchar *hash_get_key_for_sp_head(const uchar *ptr, size_t *plen,
|
|
|
|
my_bool first);
|
|
|
|
extern "C" void hash_free_sp_head(void *p);
|
|
|
|
|
|
|
|
uchar *hash_get_key_for_sp_head(const uchar *ptr, size_t *plen,
|
|
|
|
my_bool first)
|
2003-07-03 16:01:31 +02:00
|
|
|
{
|
2004-03-11 17:18:59 +01:00
|
|
|
sp_head *sp= (sp_head *)ptr;
|
|
|
|
*plen= sp->m_qname.length;
|
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
|
|
|
return (uchar*) sp->m_qname.str;
|
2003-07-03 16:01:31 +02:00
|
|
|
}
|
|
|
|
|
2005-08-11 14:58:15 +02:00
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
void hash_free_sp_head(void *p)
|
2003-12-15 13:24:16 +01:00
|
|
|
{
|
|
|
|
sp_head *sp= (sp_head *)p;
|
|
|
|
delete sp;
|
|
|
|
}
|
|
|
|
|
2005-08-11 14:58:15 +02:00
|
|
|
|
2003-07-03 16:01:31 +02:00
|
|
|
sp_cache::sp_cache()
|
|
|
|
{
|
|
|
|
init();
|
|
|
|
}
|
|
|
|
|
2005-08-11 14:58:15 +02:00
|
|
|
|
2003-07-03 16:01:31 +02:00
|
|
|
sp_cache::~sp_cache()
|
|
|
|
{
|
|
|
|
hash_free(&m_hashtable);
|
|
|
|
}
|
|
|
|
|
2005-08-11 14:58:15 +02:00
|
|
|
|
2003-07-03 16:01:31 +02:00
|
|
|
void
|
|
|
|
sp_cache::init()
|
|
|
|
{
|
|
|
|
hash_init(&m_hashtable, system_charset_info, 0, 0, 0,
|
2003-12-15 13:24:16 +01:00
|
|
|
hash_get_key_for_sp_head, hash_free_sp_head, 0);
|
2003-10-21 12:08:35 +02:00
|
|
|
version= 0;
|
2003-07-03 16:01:31 +02:00
|
|
|
}
|
|
|
|
|
2005-08-11 14:58:15 +02:00
|
|
|
|
2003-07-03 16:01:31 +02:00
|
|
|
void
|
|
|
|
sp_cache::cleanup()
|
|
|
|
{
|
|
|
|
hash_free(&m_hashtable);
|
|
|
|
}
|