mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
08dd5dcf16
Now we don't take any mutexes when creating or dropping internal HEAP tables during SELECT. Change buffer sizes to size_t to make keycache 64 bit safe on platforms where sizeof(ulong) != sizeof(size_t) BitKeeper/etc/ignore: added support-files/mysqld_multi.server include/heap.h: Added 'internal_table' to HP_CREATE_INFO include/keycache.h: Change buffer sizes to size_t to make keycache 64 bit safe include/my_base.h: Added HA_OPEN_INTERNAL_TABLE to mark temporary tables that should be deleted on close mysys/mf_keycache.c: Change buffer sizes to size_t to make keycache 64 bit safe sql/sql_select.cc: Added HA_OPEN_INTERNAL_TABLE to mark temporary tables that should be deleted on close Removed not anymore needed call to delete_table() storage/heap/ha_heap.cc: Added support for internal temporary tables that should be deleted on close. Internal tables now use dedicated open and close calls to avoid taking mutexes. If heap_open() failes, now delete the newly created table. (This fixes a possible memory leak) Remove never executed info() in create() storage/heap/ha_heap.h: Added slots needed to handle internal temporary tables storage/heap/heapdef.h: Protect against C++ inclusion storage/heap/hp_close.c: Don't call list_delete() for internal temporary tables (They are not in the list) storage/heap/hp_create.c: Added HP_SHARE ** element to heap_create() to store the SHARE of the newly created table. For internal temporary tables: Don't take any mutex and don't put them into the open table list. storage/heap/hp_open.c: Split heap_open() into sub functions to be able to create internal temporary tables without putting them in the heap_share_list. Add faster open() functions for when we already know the 'share'. storage/heap/hp_test1.c: Update call to heap_create() Initialize all keyinfo members. storage/heap/hp_test2.c: Update call to heap_create()
135 lines
3.4 KiB
C
135 lines
3.4 KiB
C
/* Copyright (C) 2000-2004, 2006 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
/* open a heap-database */
|
|
|
|
#include "heapdef.h"
|
|
#ifdef VMS
|
|
#include "hp_static.c" /* Stupid vms-linker */
|
|
#endif
|
|
|
|
#include "my_sys.h"
|
|
|
|
/*
|
|
Open heap table based on HP_SHARE structure
|
|
|
|
NOTE
|
|
This doesn't register the table in the open table list.
|
|
*/
|
|
|
|
HP_INFO *heap_open_from_share(HP_SHARE *share, int mode)
|
|
{
|
|
HP_INFO *info;
|
|
DBUG_ENTER("heap_open_from_share");
|
|
|
|
if (!(info= (HP_INFO*) my_malloc((uint) sizeof(HP_INFO) +
|
|
2 * share->max_key_length,
|
|
MYF(MY_ZEROFILL))))
|
|
{
|
|
DBUG_RETURN(0);
|
|
}
|
|
share->open_count++;
|
|
#ifdef THREAD
|
|
thr_lock_data_init(&share->lock,&info->lock,NULL);
|
|
#endif
|
|
info->s= share;
|
|
info->lastkey= (uchar*) (info + 1);
|
|
info->recbuf= (uchar*) (info->lastkey + share->max_key_length);
|
|
info->mode= mode;
|
|
info->current_record= (ulong) ~0L; /* No current record */
|
|
info->lastinx= info->errkey= -1;
|
|
#ifndef DBUG_OFF
|
|
info->opt_flag= READ_CHECK_USED; /* Check when changing */
|
|
#endif
|
|
DBUG_PRINT("exit",("heap: 0x%lx reclength: %d records_in_block: %d",
|
|
(long) info, share->reclength,
|
|
share->block.records_in_block));
|
|
DBUG_RETURN(info);
|
|
}
|
|
|
|
|
|
/*
|
|
Open heap table based on HP_SHARE structure and register it
|
|
*/
|
|
|
|
HP_INFO *heap_open_from_share_and_register(HP_SHARE *share, int mode)
|
|
{
|
|
HP_INFO *info;
|
|
DBUG_ENTER("heap_open_from_share_and_register");
|
|
|
|
pthread_mutex_lock(&THR_LOCK_heap);
|
|
if ((info= heap_open_from_share(share, mode)))
|
|
{
|
|
info->open_list.data= (void*) info;
|
|
heap_open_list= list_add(heap_open_list,&info->open_list);
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(info);
|
|
}
|
|
|
|
|
|
/*
|
|
Open heap table based on name
|
|
|
|
NOTE
|
|
This register the table in the open table list. so that it can be
|
|
found by future heap_open() calls.
|
|
*/
|
|
|
|
HP_INFO *heap_open(const char *name, int mode)
|
|
{
|
|
HP_INFO *info;
|
|
HP_SHARE *share;
|
|
DBUG_ENTER("heap_open");
|
|
|
|
pthread_mutex_lock(&THR_LOCK_heap);
|
|
if (!(share= hp_find_named_heap(name)))
|
|
{
|
|
my_errno= ENOENT;
|
|
pthread_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(0);
|
|
}
|
|
if ((info= heap_open_from_share(share, mode)))
|
|
{
|
|
info->open_list.data= (void*) info;
|
|
heap_open_list= list_add(heap_open_list,&info->open_list);
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(info);
|
|
}
|
|
|
|
|
|
/* map name to a heap-nr. If name isn't found return 0 */
|
|
|
|
HP_SHARE *hp_find_named_heap(const char *name)
|
|
{
|
|
LIST *pos;
|
|
HP_SHARE *info;
|
|
DBUG_ENTER("heap_find");
|
|
DBUG_PRINT("enter",("name: %s",name));
|
|
|
|
for (pos= heap_share_list; pos; pos= pos->next)
|
|
{
|
|
info= (HP_SHARE*) pos->data;
|
|
if (!strcmp(name, info->name))
|
|
{
|
|
DBUG_PRINT("exit", ("Old heap_database: 0x%lx", (long) info));
|
|
DBUG_RETURN(info);
|
|
}
|
|
}
|
|
DBUG_RETURN((HP_SHARE *) 0);
|
|
}
|
|
|
|
|