mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 17:33:44 +01:00
e72124c4cc
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables. ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set (One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set) Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib) New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones) Removed compiler warnings Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag. BUILD/compile-pentium-valgrind-max: Add test of isam client/mysql.cc: CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS include/my_base.h: Remove HA_EXTRA_SET_KEY_CACHE include/my_no_pthread.h: Add defines to ignore rw-locks when running without threads include/my_sys.h: Added function for multi-key-caches include/myisam.h: Added function to handle multi-key-caches include/mysql.h: Added mysql_set_server_option include/mysql_com.h: CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS Added enum_mysql_set_option include/mysqld_error.h: Added error message for unknown key cache innobase/srv/srv0start.c: Removed warning that is confused for MySQL users libmysql/libmysql.c: Added mysql_set_server_option() libmysql/libmysql.def: Added mysql_set_server_option() myisam/ft_nlq_search.c: Removed compiler warning myisam/ft_static.c: Removed compiler warning and fixed wrong return value myisam/mi_check.c: Clean up multi-key-cache usage myisam/mi_checksum.c: Removed not used variable myisam/mi_close.c: keycache -> key_cache myisam/mi_delete_all.c: keycache -> key_cache myisam/mi_extra.c: keycache -> key_cache Removed HA_EXTRA_SET_KEY_CACHE myisam/mi_keycache.c: Changed logic so that it's MyISAM that is responsible for assign tables to different key caches instead of the upper level myisam/mi_locking.c: Don't change key cache on unlock (must be done before) myisam/mi_open.c: Fetch key cache to use from multi_key_cache_search() myisam/mi_page.c: keycache -> key_cache myisam/mi_panic.c: keycache -> key_cache myisam/mi_preload.c: keycache -> key_cache myisam/mi_test1.c: Use KEY_CACHE_BLOCK_SIZE myisam/mi_test2.c: Always test resize_key_cache() myisam/mi_test3.c: Use KEY_CACHE_BLOCK_SIZE instead of 512 myisam/myisamchk.c: update for multiple key caches myisam/myisamdef.h: Remove reg_keycache Add unique_name_length for storing length of unique_file_name myisam/myisamlog.c: Change how end_key_cache() is called mysql-test/mysql-test-run.sh: Fixed web link Added name of failed test to abort row. mysql-test/r/alter_table.result: Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET mysql-test/r/case.result: Update result for DEFAULT CHARSET... mysql-test/r/cast.result: Update result for DEFAULT CHARSET... mysql-test/r/create.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_collate.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_latin1_de.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_many.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_mb.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_recoding.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_ucs.result: Update result for DEFAULT CHARSET... mysql-test/r/derived.result: Use STRAIGHT_JOIN to make join order predictable mysql-test/r/fulltext.result: Update result for DEFAULT CHARSET... mysql-test/r/func_str.result: Update result for DEFAULT CHARSET... mysql-test/r/func_system.result: Update result for DEFAULT CHARSET... mysql-test/r/gis-rtree.result: Update result for DEFAULT CHARSET... mysql-test/r/innodb.result: Update result for DEFAULT CHARSET... mysql-test/r/key_cache.result: Update test for new key cache syntax. Added more tests mysql-test/r/merge.result: Update result for DEFAULT CHARSET... mysql-test/r/preload.result: New syntax mysql-test/r/show_check.result: Update result for DEFAULT CHARSET... mysql-test/r/sql_mode.result: Update result for DEFAULT CHARSET... mysql-test/r/subselect.result: Update result for DEFAULT CHARSET... mysql-test/r/type_blob.result: Update result for DEFAULT CHARSET... mysql-test/r/type_enum.result: Update result for DEFAULT CHARSET... mysql-test/r/type_nchar.result: Update result for DEFAULT CHARSET... mysql-test/r/type_set.result: Update result for DEFAULT CHARSET... mysql-test/r/union.result: Use STRAIGHT_JOIN to make join order predictable mysql-test/t/alter_table.test: Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET mysql-test/t/ctype_many.test: Update result for DEFAULT CHARSET... mysql-test/t/derived.test: Use STRAIGHT_JOIN to make join order predictable mysql-test/t/isam.test: Use disable warnings for test loop mysql-test/t/join.test: Update test now when we only support 61 tables in join mysql-test/t/key_cache.test: Update test for new key cache syntax. Added more tests mysql-test/t/preload.test: Update for new syntax mysql-test/t/union.test: Use STRAIGHT_JOIN to make join order predictable mysys/Makefile.am: Added mf_keycaches.c mysys/hash.c: TRUE -> 1 mysys/mf_keycache.c: Removed compiler warnings Striped end space Fixed indentation and improved function comments TRUE -> 1 Changed parameters to end_key_cache() to make it easer to use Fixed bug when using key blocks size > 1024 bytes (First part of index file could be overwritten with wrong data) Split function flush_key_blocks into two functions to not get mutex used twice when called from flush_all_key_blocks() mysys/my_bitmap.c: More debugging Safe bitmap_free() Fixed indentation mysys/my_getopt.c: Ensure that we initialize option->value, option->max_value and value from GET_ASK_ADDR mysys/my_thr_init.c: Remove not used mutex THR_LOCK_keycache mysys/typelib.c: Fixed function comments sql-common/client.c: CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS Fixed the multi_result flag is set also on SELECT;s sql/ha_myisam.cc: Fixed multiple key_cache handling (Now done on MyISAM level) sql/ha_myisammrg.cc: Fixed multiple key_cache handling (Now done on MyISAM level) sql/handler.cc: New multi key cache handling sql/handler.h: New multi key cache handling Added support for default character set sql/item.h: Added function cleanup() (Needed for prepared statements / cursors) sql/item_cmpfunc.h: Added cleanup function sql/item_func.cc: Indentation cleanup sql/mysql_priv.h: New multi-key-cache functions Removed LOCK_assign sql/mysqld.cc: New multi-key-cache handling Fixed that variable have_compress is set correctly sql/protocol.cc: SELECT didn't work reliable in multi-statements sql/set_var.cc: Support for new key cache variables sql/set_var.h: Support for new key cache variables sql/share/czech/errmsg.txt: New error messages sql/share/danish/errmsg.txt: New error messages sql/share/dutch/errmsg.txt: New error messages sql/share/english/errmsg.txt: New error messages sql/share/estonian/errmsg.txt: New error messages sql/share/french/errmsg.txt: New error messages sql/share/german/errmsg.txt: New error messages sql/share/greek/errmsg.txt: New error messages sql/share/hungarian/errmsg.txt: New error messages sql/share/italian/errmsg.txt: New error messages sql/share/japanese/errmsg.txt: New error messages sql/share/korean/errmsg.txt: New error messages sql/share/norwegian-ny/errmsg.txt: New error messages sql/share/norwegian/errmsg.txt: New error messages sql/share/polish/errmsg.txt: New error messages sql/share/portuguese/errmsg.txt: New error messages sql/share/romanian/errmsg.txt: New error messages sql/share/russian/errmsg.txt: New error messages sql/share/serbian/errmsg.txt: New error messages sql/share/slovak/errmsg.txt: New error messages sql/share/spanish/errmsg.txt: New error messages sql/share/swedish/errmsg.txt: New error messages sql/share/ukrainian/errmsg.txt: New error messages sql/sql_base.cc: Removed all key_cache handling (this is now done on MyISAM level) Change table_charset -> default_table_charset sql/sql_db.cc: table_charset -> default_table_charset sql/sql_delete.cc: table_charset -> default_table_charset sql/sql_lex.cc: CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS sql/sql_lex.h: New option to store a name and length sql/sql_parse.cc: Support for mysql_set_server_option() Reset "default" keycache status variables in 'FLUSH STATUS' (Need to be improved later) sql/sql_show.cc: Add DEFAULT before CHARSET (for table character sets) Fetch key cache variables from 'sql_key_cache' sql/sql_table.cc: table_charset -> default_table_charset New multi-key-cache handling sql/sql_test.cc: Write information from all key caches sql/sql_yacc.yy: Changed syntax for CACHE INDEX ... Force user to use DEFAULT before database/table level character sets sql/structs.h: Added SHOW_KEY_CACHE_LONG (to get values from sql_key_cache) sql/table.cc: table_charset -> default_table_charset sql/table.h: New key cache handling (this is now done in mysys/mf_keycaches.c) sql/unireg.h: A
359 lines
8.5 KiB
C
359 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 <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_keycache);
|
|
}
|
|
|
|
|
|
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_HANDLE *multi_key_cache_search(byte *key, uint length)
|
|
{
|
|
if (!key_cache_hash.hash.records)
|
|
return dflt_keycache;
|
|
return (KEY_CACHE_HANDLE*) 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_HANDLE *key_cache)
|
|
{
|
|
return safe_hash_set(&key_cache_hash, key, length, (byte*) key_cache);
|
|
}
|
|
|
|
|
|
void multi_key_cache_change(KEY_CACHE_HANDLE *old_data,
|
|
KEY_CACHE_HANDLE *new_data)
|
|
{
|
|
safe_hash_change(&key_cache_hash, (byte*) old_data, (byte*) new_data);
|
|
}
|