mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
33c57e2f9e
an atomic counter" Split the large LOCK_open section in open_table(). Do not call open_table_from_share() under LOCK_open. Remove thd->version. This fixes Bug#50589 "Server hang on a query evaluated using a temporary table" Bug#51557 "LOCK_open and kernel_mutex are not happy together" Bug#49463 "LOCK_table and innodb are not nice when handler instances are created". This patch has effect on storage engines that rely on ha_open() PSEA method being called under LOCK_open. In particular: 1) NDB is broken and left unfixed. NDB relies on LOCK_open being kept as part of ha_open(), since it uses auto-discovery. While previously the NDB open code was race-prone, now it simply fails on asserts. 2) HEAP engine had a race in ha_heap::open() when a share for the same table could be added twice to the list of shares, or a dangling reference to a share stored in HEAP handler. This patch aims to address this problem by 'pinning' the newly created share in the internal HEAP engine share list until at least one handler instance is created using that share. include/heap.h: Add members to HP_CREATE_INFO. Declare heap_release_share(). sql/lock.cc: Remove thd->version, use thd->open_tables->s->version instead. sql/repl_failsafe.cc: Remove thd->version. sql/sql_base.cc: - close_thread_table(): move handler cleanup code outside the critical section protected by LOCK_open. - remove thd->version - split the large critical section in open_table() that opens a new table from share and is protected by LOCK_open into 2 critical sections, thus reducing the critical path. - make check_if_table_exists() acquire LOCK_open internally. - use thd->open_tables->s->version instead of thd->refresh_version to make sure that all tables in thd->open_tables are in the same refresh series. sql/sql_base.h: Add declaration for check_if_table_exists(). sql/sql_class.cc: Remove init_open_tables_state(), it's now equal to reset_open_tables_state(). sql/sql_class.h: Remove thd->version, THD::init_open_tables_state(). sql/sql_plugin.cc: Use table->m_needs_reopen to mark the table as stale rather than manipulate with thd->version, which is no more. sql/sql_udf.cc: Use table->m_needs_reopen to mark the table as stale rather than manipulate with thd->version, which is no more. sql/table.h: Remove an unused variable. sql/tztime.cc: Use table->m_needs_reopen to mark the table as stale rather than manipulate with thd->version, which is no more. storage/heap/CMakeLists.txt: Add heap tests to cmake build files. storage/heap/ha_heap.cc: Fix a race when ha_heap::ha_open() could insert two HP_SHARE objects into the internal share list or store a dangling reference to a share in ha_heap instance, or wrongly set implicit_emptied. storage/heap/hp_create.c: Optionally pin a newly created share in the list of shares by increasing its open_count. This is necessary to make sure that a newly created share doesn't disappear while a HP_INFO object is being created to reference it. storage/heap/hp_open.c: When adding a new HP_INFO object to the list of objects in the heap share, make sure the open_count is not increased twice. storage/heap/hp_test1.c: Adjust the test to new function signatures. storage/heap/hp_test2.c: Adjust the test to new function signatures.
156 lines
4 KiB
C
156 lines
4 KiB
C
/* Copyright (C) 2000-2004, 2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
|
|
|
|
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");
|
|
|
|
mysql_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);
|
|
/* Unpin the share, it is now pinned by the file. */
|
|
share->open_count--;
|
|
}
|
|
mysql_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(info);
|
|
}
|
|
|
|
|
|
/**
|
|
Dereference a HEAP share and free it if it's not referenced.
|
|
We don't check open_count for internal tables since they
|
|
are always thread-local, i.e. referenced by a single thread.
|
|
*/
|
|
void heap_release_share(HP_SHARE *share, my_bool internal_table)
|
|
{
|
|
/* Couldn't open table; Remove the newly created table */
|
|
if (internal_table)
|
|
hp_free(share);
|
|
else
|
|
{
|
|
mysql_mutex_lock(&THR_LOCK_heap);
|
|
if (--share->open_count == 0)
|
|
hp_free(share);
|
|
mysql_mutex_unlock(&THR_LOCK_heap);
|
|
}
|
|
}
|
|
|
|
/*
|
|
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");
|
|
|
|
mysql_mutex_lock(&THR_LOCK_heap);
|
|
if (!(share= hp_find_named_heap(name)))
|
|
{
|
|
my_errno= ENOENT;
|
|
mysql_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);
|
|
}
|
|
mysql_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);
|
|
}
|
|
|
|
|