mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
14decc4fbc
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
364 lines
8.6 KiB
C
364 lines
8.6 KiB
C
/* Copyright (C) 2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 */
|
|
|
|
/*
|
|
Handling of multiple key caches
|
|
|
|
The idea is to have a thread safe hash on the table name,
|
|
with a default key cache value that is returned if the table name is not in
|
|
the cache.
|
|
*/
|
|
|
|
#include "mysys_priv.h"
|
|
#include <keycache.h>
|
|
#include <hash.h>
|
|
#include <m_string.h>
|
|
|
|
/*****************************************************************************
|
|
General functions to handle SAFE_HASH objects.
|
|
|
|
A SAFE_HASH object is used to store the hash, the mutex and default value
|
|
needed by the rest of the key cache code.
|
|
This is a separate struct to make it easy to later reuse the code for other
|
|
purposes
|
|
|
|
All entries are linked in a list to allow us to traverse all elements
|
|
and delete selected ones. (HASH doesn't allow any easy ways to do this).
|
|
*****************************************************************************/
|
|
|
|
/*
|
|
Struct to store a key and pointer to object
|
|
*/
|
|
|
|
typedef struct st_safe_hash_entry
|
|
{
|
|
byte *key;
|
|
uint length;
|
|
byte *data;
|
|
struct st_safe_hash_entry *next, **prev;
|
|
} SAFE_HASH_ENTRY;
|
|
|
|
|
|
typedef struct st_safe_hash_with_default
|
|
{
|
|
#ifdef THREAD
|
|
rw_lock_t mutex;
|
|
#endif
|
|
HASH hash;
|
|
byte *default_value;
|
|
SAFE_HASH_ENTRY *root;
|
|
} SAFE_HASH;
|
|
|
|
|
|
/*
|
|
Free a SAFE_HASH_ENTRY
|
|
|
|
This function is called by the hash object on delete
|
|
*/
|
|
|
|
static void safe_hash_entry_free(SAFE_HASH_ENTRY *entry)
|
|
{
|
|
DBUG_ENTER("free_assign_entry");
|
|
my_free((gptr) entry, MYF(0));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/* Get key and length for a SAFE_HASH_ENTRY */
|
|
|
|
static byte *safe_hash_entry_get(SAFE_HASH_ENTRY *entry, uint *length,
|
|
my_bool not_used __attribute__((unused)))
|
|
{
|
|
*length=entry->length;
|
|
return (byte*) entry->key;
|
|
}
|
|
|
|
|
|
/*
|
|
Init a SAFE_HASH object
|
|
|
|
SYNOPSIS
|
|
safe_hash_init()
|
|
hash safe_hash handler
|
|
elements Expected max number of elements
|
|
default_value default value
|
|
|
|
NOTES
|
|
In case of error we set hash->default_value to 0 to allow one to call
|
|
safe_hash_free on an object that couldn't be initialized.
|
|
|
|
RETURN
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
static my_bool safe_hash_init(SAFE_HASH *hash, uint elements,
|
|
byte *default_value)
|
|
{
|
|
DBUG_ENTER("safe_hash");
|
|
if (hash_init(&hash->hash, &my_charset_bin, elements,
|
|
0, 0, (hash_get_key) safe_hash_entry_get,
|
|
(void (*)(void*)) safe_hash_entry_free, 0))
|
|
{
|
|
hash->default_value= 0;
|
|
DBUG_RETURN(1);
|
|
}
|
|
my_rwlock_init(&hash->mutex, 0);
|
|
hash->default_value= default_value;
|
|
hash->root= 0;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Free a SAFE_HASH object
|
|
|
|
NOTES
|
|
This is safe to call on any object that has been sent to safe_hash_init()
|
|
*/
|
|
|
|
static void safe_hash_free(SAFE_HASH *hash)
|
|
{
|
|
/*
|
|
Test if safe_hash_init succeeded. This will also guard us against multiple
|
|
free calls.
|
|
*/
|
|
if (hash->default_value)
|
|
{
|
|
hash_free(&hash->hash);
|
|
rwlock_destroy(&hash->mutex);
|
|
hash->default_value=0;
|
|
}
|
|
}
|
|
|
|
/*
|
|
Return the value stored for a key or default value if no key
|
|
*/
|
|
|
|
static byte *safe_hash_search(SAFE_HASH *hash, const byte *key, uint length)
|
|
{
|
|
byte *result;
|
|
DBUG_ENTER("safe_hash_search");
|
|
rw_rdlock(&hash->mutex);
|
|
result= hash_search(&hash->hash, key, length);
|
|
rw_unlock(&hash->mutex);
|
|
if (!result)
|
|
result= hash->default_value;
|
|
else
|
|
result= ((SAFE_HASH_ENTRY*) result)->data;
|
|
DBUG_PRINT("exit",("data: 0x%lx", (long) result));
|
|
DBUG_RETURN(result);
|
|
}
|
|
|
|
|
|
/*
|
|
Associate a key with some data
|
|
|
|
SYONOPSIS
|
|
safe_hash_set()
|
|
hash Hash handle
|
|
key key (path to table etc..)
|
|
length Length of key
|
|
data data to to associate with the data
|
|
|
|
NOTES
|
|
This can be used both to insert a new entry and change an existing
|
|
entry.
|
|
If one associates a key with the default key cache, the key is deleted
|
|
|
|
RETURN
|
|
0 ok
|
|
1 error (Can only be EOM). In this case my_message() is called.
|
|
*/
|
|
|
|
static my_bool safe_hash_set(SAFE_HASH *hash, const byte *key, uint length,
|
|
byte *data)
|
|
{
|
|
SAFE_HASH_ENTRY *entry;
|
|
my_bool error= 0;
|
|
DBUG_ENTER("safe_hash_set");
|
|
DBUG_PRINT("enter",("key: %.*s data: 0x%lx", length, key, (long) data));
|
|
|
|
rw_wrlock(&hash->mutex);
|
|
entry= (SAFE_HASH_ENTRY*) hash_search(&hash->hash, key, length);
|
|
|
|
if (data == hash->default_value)
|
|
{
|
|
/*
|
|
The key is to be associated with the default entry. In this case
|
|
we can just delete the entry (if it existed) from the hash as a
|
|
search will return the default entry
|
|
*/
|
|
if (!entry) /* nothing to do */
|
|
goto end;
|
|
/* unlink entry from list */
|
|
if ((*entry->prev= entry->next))
|
|
entry->next->prev= entry->prev;
|
|
hash_delete(&hash->hash, (byte*) entry);
|
|
goto end;
|
|
}
|
|
if (entry)
|
|
{
|
|
/* Entry existed; Just change the pointer to point at the new data */
|
|
entry->data= data;
|
|
}
|
|
else
|
|
{
|
|
if (!(entry= (SAFE_HASH_ENTRY *) my_malloc(sizeof(*entry) + length,
|
|
MYF(MY_WME))))
|
|
{
|
|
error= 1;
|
|
goto end;
|
|
}
|
|
entry->key= (byte*) (entry +1);
|
|
memcpy((char*) entry->key, (char*) key, length);
|
|
entry->length= length;
|
|
entry->data= data;
|
|
/* Link entry to list */
|
|
if ((entry->next= hash->root))
|
|
entry->next->prev= &entry->next;
|
|
entry->prev= &hash->root;
|
|
hash->root= entry;
|
|
if (my_hash_insert(&hash->hash, (byte*) entry))
|
|
{
|
|
/* This can only happen if hash got out of memory */
|
|
my_free((char*) entry, MYF(0));
|
|
error= 1;
|
|
goto end;
|
|
}
|
|
}
|
|
|
|
end:
|
|
rw_unlock(&hash->mutex);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Change all entres with one data value to another data value
|
|
|
|
SYONOPSIS
|
|
safe_hash_change()
|
|
hash Hash handle
|
|
old_data Old data
|
|
new_data Change all 'old_data' to this
|
|
|
|
NOTES
|
|
We use the linked list to traverse all elements in the hash as
|
|
this allows us to delete elements in the case where 'new_data' is the
|
|
default value.
|
|
*/
|
|
|
|
static void safe_hash_change(SAFE_HASH *hash, byte *old_data, byte *new_data)
|
|
{
|
|
SAFE_HASH_ENTRY *entry, *next;
|
|
DBUG_ENTER("safe_hash_set");
|
|
|
|
rw_wrlock(&hash->mutex);
|
|
|
|
for (entry= hash->root ; entry ; entry= next)
|
|
{
|
|
next= entry->next;
|
|
if (entry->data == old_data)
|
|
{
|
|
if (new_data == hash->default_value)
|
|
{
|
|
if ((*entry->prev= entry->next))
|
|
entry->next->prev= entry->prev;
|
|
hash_delete(&hash->hash, (byte*) entry);
|
|
}
|
|
else
|
|
entry->data= new_data;
|
|
}
|
|
}
|
|
|
|
rw_unlock(&hash->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*****************************************************************************
|
|
Functions to handle the key cache objects
|
|
*****************************************************************************/
|
|
|
|
/* Variable to store all key cache objects */
|
|
static SAFE_HASH key_cache_hash;
|
|
|
|
|
|
my_bool multi_keycache_init(void)
|
|
{
|
|
return safe_hash_init(&key_cache_hash, 16, (byte*) dflt_key_cache);
|
|
}
|
|
|
|
|
|
void multi_keycache_free(void)
|
|
{
|
|
safe_hash_free(&key_cache_hash);
|
|
}
|
|
|
|
/*
|
|
Get a key cache to be used for a specific table.
|
|
|
|
SYNOPSIS
|
|
multi_key_cache_search()
|
|
key key to find (usually table path)
|
|
uint length Length of key.
|
|
|
|
NOTES
|
|
This function is coded in such a way that we will return the
|
|
default key cache even if one never called multi_keycache_init.
|
|
This will ensure that it works with old MyISAM clients.
|
|
|
|
RETURN
|
|
key cache to use
|
|
*/
|
|
|
|
KEY_CACHE *multi_key_cache_search(byte *key, uint length)
|
|
{
|
|
if (!key_cache_hash.hash.records)
|
|
return dflt_key_cache;
|
|
return (KEY_CACHE*) safe_hash_search(&key_cache_hash, key, length);
|
|
}
|
|
|
|
|
|
/*
|
|
Assosiate a key cache with a key
|
|
|
|
|
|
SYONOPSIS
|
|
multi_key_cache_set()
|
|
key key (path to table etc..)
|
|
length Length of key
|
|
key_cache cache to assococite with the table
|
|
|
|
NOTES
|
|
This can be used both to insert a new entry and change an existing
|
|
entry
|
|
*/
|
|
|
|
|
|
my_bool multi_key_cache_set(const byte *key, uint length,
|
|
KEY_CACHE *key_cache)
|
|
{
|
|
return safe_hash_set(&key_cache_hash, key, length, (byte*) key_cache);
|
|
}
|
|
|
|
|
|
void multi_key_cache_change(KEY_CACHE *old_data,
|
|
KEY_CACHE *new_data)
|
|
{
|
|
safe_hash_change(&key_cache_hash, (byte*) old_data, (byte*) new_data);
|
|
}
|