mirror of
https://github.com/MariaDB/server.git
synced 2025-08-16 18:19:41 +00:00
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into hynda.mysql.fi:/home/my/mysql-maria BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8: Auto merged client/mysqldump.c: Auto merged include/Makefile.am: Auto merged include/m_string.h: Auto merged include/my_base.h: Auto merged include/my_dbug.h: Auto merged libmysql/CMakeLists.txt: Auto merged libmysql/Makefile.shared: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/include/varchar.inc: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/events_logs_tests.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/events_logs_tests.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/view.test: Auto merged mysys/Makefile.am: Auto merged mysys/my_create.c: Auto merged mysys/my_handler.c: Auto merged mysys/my_init.c: Auto merged mysys/my_open.c: Auto merged mysys/safemalloc.c: Auto merged plugin/daemon_example/daemon_example.cc: Auto merged sql/Makefile.am: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/udf_example.c: Auto merged sql/uniques.cc: Auto merged sql/unireg.cc: Auto merged storage/csv/ha_tina.cc: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/fulltext.h: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_checksum.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged unittest/Makefile.am: Auto merged BitKeeper/triggers/post-commit: Manual merge from mysql-5.1 to mysql-maria configure.in: Manual merge from mysql-5.1 to mysql-maria include/ft_global.h: Manual merge from mysql-5.1 to mysql-maria include/keycache.h: Manual merge from mysql-5.1 to mysql-maria include/my_atomic.h: Manual merge from mysql-5.1 to mysql-maria include/my_global.h: Manual merge from mysql-5.1 to mysql-maria include/my_sys.h: Manual merge from mysql-5.1 to mysql-maria include/myisam.h: Manual merge from mysql-5.1 to mysql-maria mysys/array.c: Manual merge from mysql-5.1 to mysql-maria mysys/mf_keycache.c: Manual merge from mysql-5.1 to mysql-maria mysys/mf_keycaches.c: Manual merge from mysql-5.1 to mysql-maria mysys/my_pread.c: Manual merge from mysql-5.1 to mysql-maria sql/mysqld.cc: Manual merge from mysql-5.1 to mysql-maria sql/net_serv.cc: Manual merge from mysql-5.1 to mysql-maria sql/set_var.cc: Manual merge from mysql-5.1 to mysql-maria sql/set_var.h: Manual merge from mysql-5.1 to mysql-maria sql/sql_class.h: Manual merge from mysql-5.1 to mysql-maria storage/myisam/ft_static.c: Manual merge from mysql-5.1 to mysql-maria storage/myisam/ha_myisam.cc: Manual merge from mysql-5.1 to mysql-maria storage/myisam/mi_check.c: Manual merge from mysql-5.1 to mysql-maria storage/myisam/mi_dynrec.c: Manual merge from mysql-5.1 to mysql-maria storage/myisam/mi_packrec.c: Manual merge from mysql-5.1 to mysql-maria storage/myisam/mi_write.c: Manual merge from mysql-5.1 to mysql-maria storage/myisam/myisamchk.c: Manual merge from mysql-5.1 to mysql-maria storage/myisam/myisamdef.h: Manual merge from mysql-5.1 to mysql-maria storage/myisammrg/ha_myisammrg.cc: Manual merge from mysql-5.1 to mysql-maria unittest/mysys/Makefile.am: Manual merge from mysql-5.1 to mysql-maria unittest/mysys/my_atomic-t.c: Manual merge from mysql-5.1 to mysql-maria
This commit is contained in:
unknown
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2003 MySQL AB
|
||||
/* Copyright (C) 2003-2007 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
|
||||
@ -25,269 +25,7 @@
|
||||
#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
|
||||
{
|
||||
uchar *key;
|
||||
uint length;
|
||||
uchar *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;
|
||||
uchar *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((uchar*) entry, MYF(0));
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
||||
/* Get key and length for a SAFE_HASH_ENTRY */
|
||||
|
||||
static uchar *safe_hash_entry_get(SAFE_HASH_ENTRY *entry, size_t *length,
|
||||
my_bool not_used __attribute__((unused)))
|
||||
{
|
||||
*length=entry->length;
|
||||
return (uchar*) 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,
|
||||
uchar *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 uchar *safe_hash_search(SAFE_HASH *hash, const uchar *key, uint length)
|
||||
{
|
||||
uchar *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 uchar *key, uint length,
|
||||
uchar *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, (uchar*) 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= (uchar*) (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, (uchar*) 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, uchar *old_data, uchar *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, (uchar*) entry);
|
||||
}
|
||||
else
|
||||
entry->data= new_data;
|
||||
}
|
||||
}
|
||||
|
||||
rw_unlock(&hash->mutex);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
#include "my_safehash.h"
|
||||
|
||||
/*****************************************************************************
|
||||
Functions to handle the key cache objects
|
||||
@ -315,6 +53,7 @@ void multi_keycache_free(void)
|
||||
multi_key_cache_search()
|
||||
key key to find (usually table path)
|
||||
uint length Length of key.
|
||||
def Default value if no key cache
|
||||
|
||||
NOTES
|
||||
This function is coded in such a way that we will return the
|
||||
@ -325,11 +64,13 @@ void multi_keycache_free(void)
|
||||
key cache to use
|
||||
*/
|
||||
|
||||
KEY_CACHE *multi_key_cache_search(uchar *key, uint length)
|
||||
KEY_CACHE *multi_key_cache_search(uchar *key, uint length,
|
||||
KEY_CACHE *def)
|
||||
{
|
||||
if (!key_cache_hash.hash.records)
|
||||
return dflt_key_cache;
|
||||
return (KEY_CACHE*) safe_hash_search(&key_cache_hash, key, length);
|
||||
return def;
|
||||
return (KEY_CACHE*) safe_hash_search(&key_cache_hash, key, length,
|
||||
(void*) def);
|
||||
}
|
||||
|
||||
|
||||
@ -361,3 +102,5 @@ void multi_key_cache_change(KEY_CACHE *old_data,
|
||||
{
|
||||
safe_hash_change(&key_cache_hash, (uchar*) old_data, (uchar*) new_data);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user