mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
35da5e43fb
Fixed compiler warnings (IRIX C compiler and VC++) VC++Files/client/mysqlclient.dsp: Add missing file to project VC++Files/libmysql/libmysql.dsp: Add missing file to project VC++Files/myisam/myisam.dsp: Add missing file to project VC++Files/mysys/mysys.dsp: Add missing file to project heap/hp_test1.c: Fixed wrong call to heap_rkey() heap/hp_test2.c: Fixed wrong call to heap_rkey() include/hash.h: Move not used (internal) struct to hash.c include/my_pthread.h: Made some structs 'const char*' to avoid warnings include/my_sys.h: Moved key cache structs and functions to keycache.h include/myisam.h: Merge key cache structures to one include/mysql.h: Remove STDCALL from internal functions include/sql_common.h: Remove STDCALL from internal functions include/violite.h: Fixed compiler warning isam/_locking.c: Merge key cache structures to one isam/_page.c: Merge key cache structures to one isam/close.c: Merge key cache structures to one isam/extra.c: Merge key cache structures to one isam/isamchk.c: Merge key cache structures to one isam/isamdef.h: Merge key cache structures to one isam/isamlog.c: Merge key cache structures to one isam/panic.c: Merge key cache structures to one isam/test2.c: Merge key cache structures to one isam/test3.c: Merge key cache structures to one libmysql/client_settings.h: Remove STDCALL from internal functions libmysql/libmysql.c: Remove STDCALL from internal functions myisam/ft_boolean_search.c: Fixed compiler warning myisam/ft_dump.c: Fixed compiler warnings (%qx is not portable) myisam/ft_update.c: Fixed compiler warnings myisam/mi_check.c: Merge key cache structures to one myisam/mi_close.c: Merge key cache structures to one myisam/mi_delete_all.c: Merge key cache structures to one myisam/mi_extra.c: Merge key cache structures to one myisam/mi_keycache.c: Merge key cache structures to one myisam/mi_locking.c: Merge key cache structures to one myisam/mi_page.c: Merge key cache structures to one myisam/mi_panic.c: Merge key cache structures to one myisam/mi_preload.c: Merge key cache structures to one myisam/mi_test1.c: Merge key cache structures to one myisam/mi_test2.c: Merge key cache structures to one myisam/mi_test3.c: Merge key cache structures to one myisam/myisamchk.c: Merge key cache structures to one myisam/myisamdef.h: Merge key cache structures to one myisam/myisamlog.c: Merge key cache structures to one Removed not used option myisam/sort.c: Fixed compiler warnings myisam/sp_test.c: Fixed compiler warnings mysql-test/r/case.result: Updated results after fix of correct NULL detection in WHEN mysql-test/r/date_formats.result: Updated results after fixing date handling mysql-test/r/symlink.result: Updated results after adding DEFAULT CHARSET mysql-test/t/case.test: New test mysql-test/t/symlink.test: Updated error numbers mysys/hash.c: Made HASH_LINK struct local mysys/mf_keycache.c: Merge key cache structures to one Fixed key_cache_read() and key_cache_write() to be resize-safe. mysys/mf_keycaches.c: Merge key cache structures to one mysys/thr_mutex.c: Added test if mutex is initalized sql-common/client.c: Remove STDCALL from internal functions sql/derror.cc: Added comment sql/field.cc: Removed not used variables sql/ha_innodb.cc: Fixed compiler warnings (removed not used variables) sql/ha_myisam.cc: Merge key cache structures to one sql/ha_myisammrg.cc: Removed not used variables sql/handler.cc: Merge key cache structures to one sql/handler.h: Merge key cache structures to one sql/item.cc: Fixed compiler warning sql/item_cmpfunc.cc: Remove not used variables sql/item_func.cc: Remove not used variables sql/item_strfunc.cc: Removed not used variables sql/item_sum.cc: Removed not used variables Moved setting of item_thd to fix_fields() sql/item_timefunc.cc: Removed not used variables sql/mysql_priv.h: Merge key cache structures to one sql/mysqld.cc: Merge key cache structures to one init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used sql/opt_sum.cc: Remove not used variables sql/protocol.cc: Don't send errors after ok has been sent sql/protocol_cursor.cc: Remove not used variable Simple optimization sql/repl_failsafe.cc: Remove not used variables sql/set_var.cc: Merge key cache structures to one sql/set_var.h: Merge key cache structures to one sql/sql_acl.cc: Remove not used variables sql/sql_base.cc: Remove not used function sql/sql_db.cc: Remove not used variables sql/sql_handler.cc: Remove not used variables sql/sql_insert.cc: More DBUG statements Simple code cleanup sql/sql_lex.cc: Remove not used variables sql/sql_parse.cc: Remove not used variables sql/sql_prepare.cc: Remove not used variables sql/sql_repl.cc: Remove not used variables sql/sql_select.cc: Remove not used variables sql/sql_show.cc: Remove not used variables sql/sql_table.cc: Merge key cache structures to one Removed not used variables sql/sql_test.cc: Merge key cache structures to one sql/strfunc.cc: Fixed that find_type() returns correct value for partly matched words. (This fixed the error found by date_formats.test) sql/time.cc: Remove not used variables strings/my_strtoll10.c: Fixed compiler warnings
360 lines
8.5 KiB
C
360 lines
8.5 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: %lx", 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: %lx", length, key, 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_delete((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)
|
|
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_get()
|
|
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);
|
|
}
|