mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 13:15:32 +02:00
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it
- For a busy system this change will give you:
- Less memory usage for table object
- Faster opening of tables (if it's has been in use or is in table definition cache)
- Allow you to cache many table definitions objects
- Faster drop of table
mysql-test/mysql-test-run.sh:
Fixed some problems with --gdb option
Test both with socket and tcp/ip port that all old servers are killed
mysql-test/r/flush_table.result:
More tests with lock table with 2 threads + flush table
mysql-test/r/information_schema.result:
Removed old (now wrong) result
mysql-test/r/innodb.result:
Better error messages (thanks to TDC patch)
mysql-test/r/merge.result:
Extra flush table test
mysql-test/r/ndb_bitfield.result:
Better error messages (thanks to TDC patch)
mysql-test/r/ndb_partition_error.result:
Better error messages (thanks to TDC patch)
mysql-test/r/query_cache.result:
Remove tables left from old tests
mysql-test/r/temp_table.result:
Test truncate with temporary tables
mysql-test/r/variables.result:
Table_cache -> Table_open_cache
mysql-test/t/flush_table.test:
More tests with lock table with 2 threads + flush table
mysql-test/t/merge.test:
Extra flush table test
mysql-test/t/multi_update.test:
Added 'sleep' to make test predictable
mysql-test/t/query_cache.test:
Remove tables left from old tests
mysql-test/t/temp_table.test:
Test truncate with temporary tables
mysql-test/t/variables.test:
Table_cache -> Table_open_cache
mysql-test/valgrind.supp:
Remove warning that may happens becasue threads dies in different order
mysys/hash.c:
Fixed wrong DBUG_PRINT
mysys/mf_dirname.c:
More DBUG
mysys/mf_pack.c:
Better comment
mysys/mf_tempdir.c:
More DBUG
Ensure that we call cleanup_dirname() on all temporary directory paths.
If we don't do this, we will get a failure when comparing temporary table
names as in some cases the temporary table name is run through convert_dirname())
mysys/my_alloc.c:
Indentation fix
sql/examples/ha_example.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_example.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/field.cc:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Use s->db instead of s->table_cache_key
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/field.h:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/ha_archive.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_archive.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_berkeley.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Changed name of argument create() to not hide internal 'table' variable.
table->s -> table_share
sql/ha_berkeley.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_federated.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed comments
Remove index variable and replace with pointers (simple optimization)
move_field() -> move_field_offset()
Removed some strlen() calls
sql/ha_federated.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_heap.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Simplify delete_table() and create() as the given file names are now without extension
sql/ha_heap.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisam.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Remove not needed fn_format()
Fixed for new table->s structure
sql/ha_myisam.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisammrg.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Don't set 'is_view' for MERGE tables
Use new interface to find_temporary_table()
sql/ha_myisammrg.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Added flag HA_NO_COPY_ON_ALTER
sql/ha_ndbcluster.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed wrong calls to strxnmov()
Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed
drop_table -> intern_drop_table()
table->s -> table_share
Move part_info to TABLE
Fixed comments & DBUG print's
New arguments to print_error()
sql/ha_ndbcluster.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_partition.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
We can't set up or use part_info when creating handler as there is not yet any table object
New ha_intialise() to work with TDC (Done by Mikael)
sql/ha_partition.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Got set_part_info() from Mikael
sql/handler.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
ha_delete_table() now also takes database as an argument
handler::ha_open() now takes TABLE as argument
ha_open() now calls ha_allocate_read_write_set()
Simplify ha_allocate_read_write_set()
Remove ha_deallocate_read_write_set()
Use table_share (Cached by table definition cache)
sql/handler.h:
New table flag: HA_NO_COPY_ON_ALTER (used by merge tables)
Remove ha_deallocate_read_write_set()
get_new_handler() now takes TABLE_SHARE as argument
ha_delete_table() now gets database as argument
sql/item.cc:
table_name and db are now LEX_STRING objects
When creating fields, we have now have to call field->init(table)
move_field -> move_field_offset()
sql/item.h:
tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR
instead of BLOB
sql/item_cmpfunc.cc:
Fixed call to tmp_table_field_from_field_type()
sql/item_create.cc:
Assert if new not handled cast type
sql/item_func.cc:
When creating fields, we have now have to call field->init(table)
dummy_table used by 'sp' now needs a TABLE_SHARE object
sql/item_subselect.cc:
Trivial code cleanups
sql/item_sum.cc:
When creating fields, we have now have to call field->init(table)
sql/item_timefunc.cc:
Item_func_str_to_date::tmp_table_field() now replaced by call to
tmp_table_field_from_field_type() (see item_timefunc.h)
sql/item_timefunc.h:
Simply tmp_table_field()
sql/item_uniq.cc:
When creating fields, we have now have to call field->init(table)
sql/key.cc:
Added 'KEY' argument to 'find_ref_key' to simplify code
sql/lock.cc:
More debugging
Use create_table_def_key() to create key for table cache
Allocate TABLE_SHARE properly when creating name lock
Fix that locked_table_name doesn't test same table twice
sql/mysql_priv.h:
New functions for table definition cache
New interfaces to a lot of functions.
New faster interface to find_temporary_table() and close_temporary_table()
sql/mysqld.cc:
Added support for table definition cache of size 'table_def_size'
Fixed som calls to strnmov()
Changed name of 'table_cache' to 'table_open_cache'
sql/opt_range.cc:
Use new interfaces
Fixed warnings from valgrind
sql/parse_file.cc:
Safer calls to strxnmov()
Fixed typo
sql/set_var.cc:
Added variable 'table_definition_cache'
Variable table_cache renamed to 'table_open_cache'
sql/slave.cc:
Use new interface
sql/sp.cc:
Proper use of TABLE_SHARE
sql/sp_head.cc:
Remove compiler warnings
We have now to call field->init(table)
sql/sp_head.h:
Pointers to parsed strings are now const
sql/sql_acl.cc:
table_name is now a LEX_STRING
sql/sql_base.cc:
Main implementation of table definition cache
(The #ifdef's are there for the future when table definition cache will replace open table cache)
Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places
Views are not yet cached; For the moment we only cache if a table is a view or not.
Faster implementation of find_temorary_table()
Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()'
Drop table is slightly faster as we can use the table definition cache to know the type of the table
sql/sql_cache.cc:
table_cache_key and table_name are now LEX_STRING
'sDBUG print fixes
sql/sql_class.cc:
table_cache_key is now a LEX_STRING
safer strxnmov()
sql/sql_class.h:
Added number of open table shares (table definitions)
sql/sql_db.cc:
safer strxnmov()
sql/sql_delete.cc:
Use new interface to find_temporary_table()
sql/sql_derived.cc:
table_name is now a LEX_STRING
sql/sql_handler.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_insert.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_lex.cc:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_lex.h:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_load.cc:
Safer strxnmov()
sql/sql_parse.cc:
Better error if wrong DB name
sql/sql_partition.cc:
part_info moved to TABLE from TABLE_SHARE
Indentation changes
sql/sql_select.cc:
Indentation fixes
Call field->init(TABLE) for new created fields
Update create_tmp_table() to use TABLE_SHARE properly
sql/sql_select.h:
Call field->init(TABLE) for new created fields
sql/sql_show.cc:
table_name is now a LEX_STRING
part_info moved to TABLE
sql/sql_table.cc:
Use table definition cache to speed up delete of tables
Fixed calls to functions with new interfaces
Don't use 'share_not_to_be_used'
Instead of doing openfrm() when doing repair, we now have to call
get_table_share() followed by open_table_from_share().
Replace some fn_format() with faster unpack_filename().
Safer strxnmov()
part_info is now in TABLE
Added Mikaels patch for partition and ALTER TABLE
Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER
sql/sql_test.cc:
table_name and table_cache_key are now LEX_STRING's
sql/sql_trigger.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
safer strxnmov()
Removed compiler warnings
sql/sql_update.cc:
Call field->init(TABLE) after field is created
sql/sql_view.cc:
safer strxnmov()
Create common TABLE_SHARE object for views to allow us to cache if table is a view
sql/structs.h:
Added SHOW_TABLE_DEFINITIONS
sql/table.cc:
Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats
sql/table.h:
TABLE objects for the same database table now share a common TABLE_SHARE object
In TABLE_SHARE the most common strings are now LEX_STRING's
sql/unireg.cc:
Changed arguments to rea_create_table() to have same order as other functions
Call field->init(table) for new created fields
sql/unireg.h:
Added OPEN_VIEW
strings/strxnmov.c:
Change strxnmov() to always add end \0
This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
657 lines
16 KiB
C
657 lines
16 KiB
C
/* Copyright (C) 2000 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 */
|
|
|
|
/* The hash functions used for saveing keys */
|
|
/* One of key_length or key_length_offset must be given */
|
|
/* Key length of 0 isn't allowed */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include "hash.h"
|
|
|
|
#define NO_RECORD ((uint) -1)
|
|
#define LOWFIND 1
|
|
#define LOWUSED 2
|
|
#define HIGHFIND 4
|
|
#define HIGHUSED 8
|
|
|
|
typedef struct st_hash_info {
|
|
uint next; /* index to next key */
|
|
byte *data; /* data for current entry */
|
|
} HASH_LINK;
|
|
|
|
static uint hash_mask(uint hashnr,uint buffmax,uint maxlength);
|
|
static void movelink(HASH_LINK *array,uint pos,uint next_link,uint newlink);
|
|
static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length);
|
|
|
|
static uint calc_hash(HASH *hash,const byte *key,uint length)
|
|
{
|
|
ulong nr1=1, nr2=4;
|
|
hash->charset->coll->hash_sort(hash->charset,(uchar*) key,length,&nr1,&nr2);
|
|
return nr1;
|
|
}
|
|
|
|
my_bool
|
|
_hash_init(HASH *hash,CHARSET_INFO *charset,
|
|
uint size,uint key_offset,uint key_length,
|
|
hash_get_key get_key,
|
|
void (*free_element)(void*),uint flags CALLER_INFO_PROTO)
|
|
{
|
|
DBUG_ENTER("hash_init");
|
|
DBUG_PRINT("enter",("hash: 0x%lx size: %d",hash,size));
|
|
|
|
hash->records=0;
|
|
if (my_init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0))
|
|
{
|
|
hash->free=0; /* Allow call to hash_free */
|
|
DBUG_RETURN(1);
|
|
}
|
|
hash->key_offset=key_offset;
|
|
hash->key_length=key_length;
|
|
hash->blength=1;
|
|
hash->current_record= NO_RECORD; /* For the future */
|
|
hash->get_key=get_key;
|
|
hash->free=free_element;
|
|
hash->flags=flags;
|
|
hash->charset=charset;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Call hash->free on all elements in hash.
|
|
|
|
SYNOPSIS
|
|
hash_free_elements()
|
|
hash hash table
|
|
|
|
NOTES:
|
|
Sets records to 0
|
|
*/
|
|
|
|
static inline void hash_free_elements(HASH *hash)
|
|
{
|
|
if (hash->free)
|
|
{
|
|
HASH_LINK *data=dynamic_element(&hash->array,0,HASH_LINK*);
|
|
HASH_LINK *end= data + hash->records;
|
|
while (data < end)
|
|
(*hash->free)((data++)->data);
|
|
}
|
|
hash->records=0;
|
|
}
|
|
|
|
|
|
/*
|
|
Free memory used by hash.
|
|
|
|
SYNOPSIS
|
|
hash_free()
|
|
hash the hash to delete elements of
|
|
|
|
NOTES: Hash can't be reused without calling hash_init again.
|
|
*/
|
|
|
|
void hash_free(HASH *hash)
|
|
{
|
|
DBUG_ENTER("hash_free");
|
|
DBUG_PRINT("enter",("hash: 0x%lx", hash));
|
|
|
|
hash_free_elements(hash);
|
|
hash->free= 0;
|
|
delete_dynamic(&hash->array);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Delete all elements from the hash (the hash itself is to be reused).
|
|
|
|
SYNOPSIS
|
|
my_hash_reset()
|
|
hash the hash to delete elements of
|
|
*/
|
|
|
|
void my_hash_reset(HASH *hash)
|
|
{
|
|
DBUG_ENTER("my_hash_reset");
|
|
DBUG_PRINT("enter",("hash: 0x%lxd",hash));
|
|
|
|
hash_free_elements(hash);
|
|
reset_dynamic(&hash->array);
|
|
/* Set row pointers so that the hash can be reused at once */
|
|
hash->blength= 1;
|
|
hash->current_record= NO_RECORD;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/* some helper functions */
|
|
|
|
/*
|
|
This function is char* instead of byte* as HPUX11 compiler can't
|
|
handle inline functions that are not defined as native types
|
|
*/
|
|
|
|
static inline char*
|
|
hash_key(HASH *hash,const byte *record,uint *length,my_bool first)
|
|
{
|
|
if (hash->get_key)
|
|
return (*hash->get_key)(record,length,first);
|
|
*length=hash->key_length;
|
|
return (byte*) record+hash->key_offset;
|
|
}
|
|
|
|
/* Calculate pos according to keys */
|
|
|
|
static uint hash_mask(uint hashnr,uint buffmax,uint maxlength)
|
|
{
|
|
if ((hashnr & (buffmax-1)) < maxlength) return (hashnr & (buffmax-1));
|
|
return (hashnr & ((buffmax >> 1) -1));
|
|
}
|
|
|
|
static uint hash_rec_mask(HASH *hash,HASH_LINK *pos,uint buffmax,
|
|
uint maxlength)
|
|
{
|
|
uint length;
|
|
byte *key= (byte*) hash_key(hash,pos->data,&length,0);
|
|
return hash_mask(calc_hash(hash,key,length),buffmax,maxlength);
|
|
}
|
|
|
|
|
|
|
|
/* for compilers which can not handle inline */
|
|
static
|
|
#if !defined(__USLC__) && !defined(__sgi)
|
|
inline
|
|
#endif
|
|
unsigned int rec_hashnr(HASH *hash,const byte *record)
|
|
{
|
|
uint length;
|
|
byte *key= (byte*) hash_key(hash,record,&length,0);
|
|
return calc_hash(hash,key,length);
|
|
}
|
|
|
|
|
|
/* Search after a record based on a key */
|
|
/* Sets info->current_ptr to found record */
|
|
|
|
gptr hash_search(HASH *hash,const byte *key,uint length)
|
|
{
|
|
HASH_LINK *pos;
|
|
uint flag,idx;
|
|
DBUG_ENTER("hash_search");
|
|
|
|
flag=1;
|
|
if (hash->records)
|
|
{
|
|
idx=hash_mask(calc_hash(hash,key,length ? length : hash->key_length),
|
|
hash->blength,hash->records);
|
|
do
|
|
{
|
|
pos= dynamic_element(&hash->array,idx,HASH_LINK*);
|
|
if (!hashcmp(hash,pos,key,length))
|
|
{
|
|
DBUG_PRINT("exit",("found key at %d",idx));
|
|
hash->current_record= idx;
|
|
DBUG_RETURN (pos->data);
|
|
}
|
|
if (flag)
|
|
{
|
|
flag=0; /* Reset flag */
|
|
if (hash_rec_mask(hash,pos,hash->blength,hash->records) != idx)
|
|
break; /* Wrong link */
|
|
}
|
|
}
|
|
while ((idx=pos->next) != NO_RECORD);
|
|
}
|
|
hash->current_record= NO_RECORD;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
/* Get next record with identical key */
|
|
/* Can only be called if previous calls was hash_search */
|
|
|
|
gptr hash_next(HASH *hash,const byte *key,uint length)
|
|
{
|
|
HASH_LINK *pos;
|
|
uint idx;
|
|
|
|
if (hash->current_record != NO_RECORD)
|
|
{
|
|
HASH_LINK *data=dynamic_element(&hash->array,0,HASH_LINK*);
|
|
for (idx=data[hash->current_record].next; idx != NO_RECORD ; idx=pos->next)
|
|
{
|
|
pos=data+idx;
|
|
if (!hashcmp(hash,pos,key,length))
|
|
{
|
|
hash->current_record= idx;
|
|
return pos->data;
|
|
}
|
|
}
|
|
hash->current_record=NO_RECORD;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Change link from pos to new_link */
|
|
|
|
static void movelink(HASH_LINK *array,uint find,uint next_link,uint newlink)
|
|
{
|
|
HASH_LINK *old_link;
|
|
do
|
|
{
|
|
old_link=array+next_link;
|
|
}
|
|
while ((next_link=old_link->next) != find);
|
|
old_link->next= newlink;
|
|
return;
|
|
}
|
|
|
|
/*
|
|
Compare a key in a record to a whole key. Return 0 if identical
|
|
|
|
SYNOPSIS
|
|
hashcmp()
|
|
hash hash table
|
|
pos position of hash record to use in comparison
|
|
key key for comparison
|
|
length length of key
|
|
|
|
NOTES:
|
|
If length is 0, comparison is done using the length of the
|
|
record being compared against.
|
|
|
|
RETURN
|
|
= 0 key of record == key
|
|
!= 0 key of record != key
|
|
*/
|
|
|
|
static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length)
|
|
{
|
|
uint rec_keylength;
|
|
byte *rec_key= (byte*) hash_key(hash,pos->data,&rec_keylength,1);
|
|
return ((length && length != rec_keylength) ||
|
|
my_strnncoll(hash->charset, (uchar*) rec_key, rec_keylength,
|
|
(uchar*) key, rec_keylength));
|
|
}
|
|
|
|
|
|
/* Write a hash-key to the hash-index */
|
|
|
|
my_bool my_hash_insert(HASH *info,const byte *record)
|
|
{
|
|
int flag;
|
|
uint halfbuff,hash_nr,first_index,idx;
|
|
byte *ptr_to_rec,*ptr_to_rec2;
|
|
HASH_LINK *data,*empty,*gpos,*gpos2,*pos;
|
|
|
|
LINT_INIT(gpos); LINT_INIT(gpos2);
|
|
LINT_INIT(ptr_to_rec); LINT_INIT(ptr_to_rec2);
|
|
|
|
flag=0;
|
|
if (!(empty=(HASH_LINK*) alloc_dynamic(&info->array)))
|
|
return(TRUE); /* No more memory */
|
|
|
|
info->current_record= NO_RECORD;
|
|
data=dynamic_element(&info->array,0,HASH_LINK*);
|
|
halfbuff= info->blength >> 1;
|
|
|
|
idx=first_index=info->records-halfbuff;
|
|
if (idx != info->records) /* If some records */
|
|
{
|
|
do
|
|
{
|
|
pos=data+idx;
|
|
hash_nr=rec_hashnr(info,pos->data);
|
|
if (flag == 0) /* First loop; Check if ok */
|
|
if (hash_mask(hash_nr,info->blength,info->records) != first_index)
|
|
break;
|
|
if (!(hash_nr & halfbuff))
|
|
{ /* Key will not move */
|
|
if (!(flag & LOWFIND))
|
|
{
|
|
if (flag & HIGHFIND)
|
|
{
|
|
flag=LOWFIND | HIGHFIND;
|
|
/* key shall be moved to the current empty position */
|
|
gpos=empty;
|
|
ptr_to_rec=pos->data;
|
|
empty=pos; /* This place is now free */
|
|
}
|
|
else
|
|
{
|
|
flag=LOWFIND | LOWUSED; /* key isn't changed */
|
|
gpos=pos;
|
|
ptr_to_rec=pos->data;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (!(flag & LOWUSED))
|
|
{
|
|
/* Change link of previous LOW-key */
|
|
gpos->data=ptr_to_rec;
|
|
gpos->next=(uint) (pos-data);
|
|
flag= (flag & HIGHFIND) | (LOWFIND | LOWUSED);
|
|
}
|
|
gpos=pos;
|
|
ptr_to_rec=pos->data;
|
|
}
|
|
}
|
|
else
|
|
{ /* key will be moved */
|
|
if (!(flag & HIGHFIND))
|
|
{
|
|
flag= (flag & LOWFIND) | HIGHFIND;
|
|
/* key shall be moved to the last (empty) position */
|
|
gpos2 = empty; empty=pos;
|
|
ptr_to_rec2=pos->data;
|
|
}
|
|
else
|
|
{
|
|
if (!(flag & HIGHUSED))
|
|
{
|
|
/* Change link of previous hash-key and save */
|
|
gpos2->data=ptr_to_rec2;
|
|
gpos2->next=(uint) (pos-data);
|
|
flag= (flag & LOWFIND) | (HIGHFIND | HIGHUSED);
|
|
}
|
|
gpos2=pos;
|
|
ptr_to_rec2=pos->data;
|
|
}
|
|
}
|
|
}
|
|
while ((idx=pos->next) != NO_RECORD);
|
|
|
|
if ((flag & (LOWFIND | LOWUSED)) == LOWFIND)
|
|
{
|
|
gpos->data=ptr_to_rec;
|
|
gpos->next=NO_RECORD;
|
|
}
|
|
if ((flag & (HIGHFIND | HIGHUSED)) == HIGHFIND)
|
|
{
|
|
gpos2->data=ptr_to_rec2;
|
|
gpos2->next=NO_RECORD;
|
|
}
|
|
}
|
|
/* Check if we are at the empty position */
|
|
|
|
idx=hash_mask(rec_hashnr(info,record),info->blength,info->records+1);
|
|
pos=data+idx;
|
|
if (pos == empty)
|
|
{
|
|
pos->data=(byte*) record;
|
|
pos->next=NO_RECORD;
|
|
}
|
|
else
|
|
{
|
|
/* Check if more records in same hash-nr family */
|
|
empty[0]=pos[0];
|
|
gpos=data+hash_rec_mask(info,pos,info->blength,info->records+1);
|
|
if (pos == gpos)
|
|
{
|
|
pos->data=(byte*) record;
|
|
pos->next=(uint) (empty - data);
|
|
}
|
|
else
|
|
{
|
|
pos->data=(byte*) record;
|
|
pos->next=NO_RECORD;
|
|
movelink(data,(uint) (pos-data),(uint) (gpos-data),(uint) (empty-data));
|
|
}
|
|
}
|
|
if (++info->records == info->blength)
|
|
info->blength+= info->blength;
|
|
return(0);
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
** Remove one record from hash-table. The record with the same record
|
|
** ptr is removed.
|
|
** if there is a free-function it's called for record if found
|
|
******************************************************************************/
|
|
|
|
my_bool hash_delete(HASH *hash,byte *record)
|
|
{
|
|
uint blength,pos2,pos_hashnr,lastpos_hashnr,idx,empty_index;
|
|
HASH_LINK *data,*lastpos,*gpos,*pos,*pos3,*empty;
|
|
DBUG_ENTER("hash_delete");
|
|
if (!hash->records)
|
|
DBUG_RETURN(1);
|
|
|
|
blength=hash->blength;
|
|
data=dynamic_element(&hash->array,0,HASH_LINK*);
|
|
/* Search after record with key */
|
|
pos=data+ hash_mask(rec_hashnr(hash,record),blength,hash->records);
|
|
gpos = 0;
|
|
|
|
while (pos->data != record)
|
|
{
|
|
gpos=pos;
|
|
if (pos->next == NO_RECORD)
|
|
DBUG_RETURN(1); /* Key not found */
|
|
pos=data+pos->next;
|
|
}
|
|
|
|
if ( --(hash->records) < hash->blength >> 1) hash->blength>>=1;
|
|
hash->current_record= NO_RECORD;
|
|
lastpos=data+hash->records;
|
|
|
|
/* Remove link to record */
|
|
empty=pos; empty_index=(uint) (empty-data);
|
|
if (gpos)
|
|
gpos->next=pos->next; /* unlink current ptr */
|
|
else if (pos->next != NO_RECORD)
|
|
{
|
|
empty=data+(empty_index=pos->next);
|
|
pos->data=empty->data;
|
|
pos->next=empty->next;
|
|
}
|
|
|
|
if (empty == lastpos) /* last key at wrong pos or no next link */
|
|
goto exit;
|
|
|
|
/* Move the last key (lastpos) */
|
|
lastpos_hashnr=rec_hashnr(hash,lastpos->data);
|
|
/* pos is where lastpos should be */
|
|
pos=data+hash_mask(lastpos_hashnr,hash->blength,hash->records);
|
|
if (pos == empty) /* Move to empty position. */
|
|
{
|
|
empty[0]=lastpos[0];
|
|
goto exit;
|
|
}
|
|
pos_hashnr=rec_hashnr(hash,pos->data);
|
|
/* pos3 is where the pos should be */
|
|
pos3= data+hash_mask(pos_hashnr,hash->blength,hash->records);
|
|
if (pos != pos3)
|
|
{ /* pos is on wrong posit */
|
|
empty[0]=pos[0]; /* Save it here */
|
|
pos[0]=lastpos[0]; /* This should be here */
|
|
movelink(data,(uint) (pos-data),(uint) (pos3-data),empty_index);
|
|
goto exit;
|
|
}
|
|
pos2= hash_mask(lastpos_hashnr,blength,hash->records+1);
|
|
if (pos2 == hash_mask(pos_hashnr,blength,hash->records+1))
|
|
{ /* Identical key-positions */
|
|
if (pos2 != hash->records)
|
|
{
|
|
empty[0]=lastpos[0];
|
|
movelink(data,(uint) (lastpos-data),(uint) (pos-data),empty_index);
|
|
goto exit;
|
|
}
|
|
idx= (uint) (pos-data); /* Link pos->next after lastpos */
|
|
}
|
|
else idx= NO_RECORD; /* Different positions merge */
|
|
|
|
empty[0]=lastpos[0];
|
|
movelink(data,idx,empty_index,pos->next);
|
|
pos->next=empty_index;
|
|
|
|
exit:
|
|
VOID(pop_dynamic(&hash->array));
|
|
if (hash->free)
|
|
(*hash->free)((byte*) record);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
/*
|
|
Update keys when record has changed.
|
|
This is much more efficent than using a delete & insert.
|
|
*/
|
|
|
|
my_bool hash_update(HASH *hash,byte *record,byte *old_key,uint old_key_length)
|
|
{
|
|
uint idx,new_index,new_pos_index,blength,records,empty;
|
|
HASH_LINK org_link,*data,*previous,*pos;
|
|
DBUG_ENTER("hash_update");
|
|
|
|
data=dynamic_element(&hash->array,0,HASH_LINK*);
|
|
blength=hash->blength; records=hash->records;
|
|
|
|
/* Search after record with key */
|
|
|
|
idx=hash_mask(calc_hash(hash, old_key,(old_key_length ?
|
|
old_key_length :
|
|
hash->key_length)),
|
|
blength,records);
|
|
new_index=hash_mask(rec_hashnr(hash,record),blength,records);
|
|
if (idx == new_index)
|
|
DBUG_RETURN(0); /* Nothing to do (No record check) */
|
|
previous=0;
|
|
for (;;)
|
|
{
|
|
|
|
if ((pos= data+idx)->data == record)
|
|
break;
|
|
previous=pos;
|
|
if ((idx=pos->next) == NO_RECORD)
|
|
DBUG_RETURN(1); /* Not found in links */
|
|
}
|
|
hash->current_record= NO_RECORD;
|
|
org_link= *pos;
|
|
empty=idx;
|
|
|
|
/* Relink record from current chain */
|
|
|
|
if (!previous)
|
|
{
|
|
if (pos->next != NO_RECORD)
|
|
{
|
|
empty=pos->next;
|
|
*pos= data[pos->next];
|
|
}
|
|
}
|
|
else
|
|
previous->next=pos->next; /* unlink pos */
|
|
|
|
/* Move data to correct position */
|
|
pos=data+new_index;
|
|
new_pos_index=hash_rec_mask(hash,pos,blength,records);
|
|
if (new_index != new_pos_index)
|
|
{ /* Other record in wrong position */
|
|
data[empty] = *pos;
|
|
movelink(data,new_index,new_pos_index,empty);
|
|
org_link.next=NO_RECORD;
|
|
data[new_index]= org_link;
|
|
}
|
|
else
|
|
{ /* Link in chain at right position */
|
|
org_link.next=data[new_index].next;
|
|
data[empty]=org_link;
|
|
data[new_index].next=empty;
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
byte *hash_element(HASH *hash,uint idx)
|
|
{
|
|
if (idx < hash->records)
|
|
return dynamic_element(&hash->array,idx,HASH_LINK*)->data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Replace old row with new row. This should only be used when key
|
|
isn't changed
|
|
*/
|
|
|
|
void hash_replace(HASH *hash, uint idx, byte *new_row)
|
|
{
|
|
if (idx != NO_RECORD) /* Safety */
|
|
dynamic_element(&hash->array,idx,HASH_LINK*)->data=new_row;
|
|
}
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
my_bool hash_check(HASH *hash)
|
|
{
|
|
int error;
|
|
uint i,rec_link,found,max_links,seek,links,idx;
|
|
uint records,blength;
|
|
HASH_LINK *data,*hash_info;
|
|
|
|
records=hash->records; blength=hash->blength;
|
|
data=dynamic_element(&hash->array,0,HASH_LINK*);
|
|
error=0;
|
|
|
|
for (i=found=max_links=seek=0 ; i < records ; i++)
|
|
{
|
|
if (hash_rec_mask(hash,data+i,blength,records) == i)
|
|
{
|
|
found++; seek++; links=1;
|
|
for (idx=data[i].next ;
|
|
idx != NO_RECORD && found < records + 1;
|
|
idx=hash_info->next)
|
|
{
|
|
if (idx >= records)
|
|
{
|
|
DBUG_PRINT("error",
|
|
("Found pointer outside array to %d from link starting at %d",
|
|
idx,i));
|
|
error=1;
|
|
}
|
|
hash_info=data+idx;
|
|
seek+= ++links;
|
|
if ((rec_link=hash_rec_mask(hash,hash_info,blength,records)) != i)
|
|
{
|
|
DBUG_PRINT("error",
|
|
("Record in wrong link at %d: Start %d Record: 0x%lx Record-link %d", idx,i,hash_info->data,rec_link));
|
|
error=1;
|
|
}
|
|
else
|
|
found++;
|
|
}
|
|
if (links > max_links) max_links=links;
|
|
}
|
|
}
|
|
if (found != records)
|
|
{
|
|
DBUG_PRINT("error",("Found %ld of %ld records"));
|
|
error=1;
|
|
}
|
|
if (records)
|
|
DBUG_PRINT("info",
|
|
("records: %ld seeks: %d max links: %d hitrate: %.2f",
|
|
records,seek,max_links,(float) seek / (float) records));
|
|
return error;
|
|
}
|
|
#endif
|