mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
e63b5546c5
It includes speed optimizations for HANDLER READ by caching as much as possible in HANDLER OPEN Other things: - Added mysqld option --disable-thr-alarm to be able to benchmark things without thr_alarm - Changed 'Locked' state to 'System lock' and 'Table lock' (these where used in the code but never shown to end user) - Better error message if mysql_install_db.sh fails - Moved handler function prototypes to sql_handler.h - Remove not anymore used 'thd->locked' member include/thr_alarm.h: Added my_disable_thr_alarm include/thr_lock.h: Add new member to THR_LOCK_DATA to remember original lock type state. This is needed as thr_unlock() resets type to TL_UNLOCK. mysql-test/include/check_no_concurrent_insert.inc: Locked -> Table lock mysql-test/include/handler.inc: Locked -> Table lock mysql-test/r/handler_innodb.result: Updated results for new tests mysql-test/r/handler_myisam.result: Updated results for new tests mysql-test/r/sp-threads.result: Locked -> Table lock mysql-test/suite/binlog/t/binlog_stm_row.test: Locked -> Table lock mysql-test/suite/funcs_1/datadict/processlist_val.inc: Locked -> Table lock mysql-test/suite/pbxt/t/lock_multi.test: Locked -> Table lock mysql-test/suite/sys_vars/r/concurrent_insert_func.result: Locked -> Table lock mysql-test/suite/sys_vars/t/concurrent_insert_func.test: Locked -> Table lock mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test: Locked -> Table lock mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test: Locked -> Table lock mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test: Locked -> Table lock mysql-test/t/insert_notembedded.test: Locked -> Table lock mysql-test/t/lock_multi.test: Locked -> Table lock mysql-test/t/merge-big.test: Locked -> Table lock mysql-test/t/multi_update.test: Locked -> Table lock mysql-test/t/query_cache_28249.test: Locked -> Table lock mysql-test/t/sp_notembedded.test: Locked -> Table lock mysql-test/t/sp_sync.test: Locked -> Table lock mysql-test/t/status.test: Locked -> Table lock mysql-test/t/trigger_notembedded.test: Locked -> Table lock mysys/thr_alarm.c: Added option to disable thr_alarm mysys/thr_lock.c: Detect loops scripts/mysql_install_db.sh: Give better error message if something goes wrong sql/Makefile.am: Added sql_handler.h sql/lock.cc: Split functions to allow one to cache value if store_lock() (for HANDLER functions). - Split mysql_lock_tables() into two functions, where first one allocates MYSQL_LOCK and other other one uses it. - Made get_lock_data() an external function. - Added argument to mysql_unlock_tables() to not free sql_lock. - Added argument to reset_lock_data() to reset lock structure to initial state (as after get_lock_data()) sql/mysql_priv.h: Moved handler function prototypes to sql_handler.h Added new lock functions. sql/mysqld.cc: Added --thread-alarm startup option sql/net_serv.cc: Don't call vio_blocking() if not needed sql/sql_base.cc: include sql_handler.h sql/sql_class.cc: include sql_handler.h Remove not anymore used 'thd->locked' member sql/sql_class.h: Remove not anymore used 'thd->locked' member sql/sql_db.cc: include sql_handler.h sql/sql_delete.cc: include sql_handler.h sql/sql_handler.cc: Rewrote all code to use SQL_HANDLER instead of TABLE_LIST (original interface) Rewrote mysql_ha_open() to cache all things from TABLE_LIST and items for field list, where etc. In mysql_ha_open() also cache MYSQL_LOCK structure from get_lock_data(). Split functions into smaller sub functions (needed to be able to implement mysql_ha_read_prepare()) Added mysql_ha_read_prepare() to allow one to prepare HANDLER READ. sql/sql_handler.h: Interface to sql_handler.cc sql/sql_parse.cc: include sql_handler.h sql/sql_prepare.cc: Added mysql_test_handler_read(), prepare for HANDLER READ sql/sql_rename.cc: include sql_handler.h sql/sql_show.cc: Removed usage of thd->locked sql/sql_table.cc: include sql_handler.h sql/sql_trigger.cc: include sql_handler.h
112 lines
2.8 KiB
C
112 lines
2.8 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; 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 */
|
|
|
|
/* Prototypes when using thr_alarm library functions */
|
|
|
|
#ifndef _thr_alarm_h
|
|
#define _thr_alarm_h
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef USE_ALARM_THREAD
|
|
#define USE_ONE_SIGNAL_HAND /* One must call process_alarm */
|
|
#endif
|
|
#ifdef HAVE_rts_threads
|
|
#undef USE_ONE_SIGNAL_HAND
|
|
#define USE_ALARM_THREAD
|
|
#define THR_SERVER_ALARM SIGUSR1
|
|
#else
|
|
#define THR_SERVER_ALARM SIGALRM
|
|
#endif
|
|
|
|
typedef struct st_alarm_info
|
|
{
|
|
time_t next_alarm_time;
|
|
uint active_alarms;
|
|
uint max_used_alarms;
|
|
} ALARM_INFO;
|
|
|
|
void thr_alarm_info(ALARM_INFO *info);
|
|
|
|
#if defined(DONT_USE_THR_ALARM) || !defined(THREAD)
|
|
|
|
#define USE_ALARM_THREAD
|
|
#undef USE_ONE_SIGNAL_HAND
|
|
|
|
typedef my_bool thr_alarm_t;
|
|
typedef my_bool ALARM;
|
|
|
|
#define thr_alarm_init(A) (*(A))=0
|
|
#define thr_alarm_in_use(A) (*(A) != 0)
|
|
#define thr_end_alarm(A)
|
|
#define thr_alarm(A,B,C) ((*(A)=1)-1)
|
|
/* The following should maybe be (*(A)) */
|
|
#define thr_got_alarm(A) 0
|
|
#define init_thr_alarm(A)
|
|
#define thr_alarm_kill(A)
|
|
#define resize_thr_alarm(N)
|
|
#define end_thr_alarm(A)
|
|
|
|
#else
|
|
#if defined(__WIN__)
|
|
typedef struct st_thr_alarm_entry
|
|
{
|
|
rf_SetTimer crono;
|
|
} thr_alarm_entry;
|
|
|
|
#else /* System with posix threads */
|
|
|
|
typedef int thr_alarm_entry;
|
|
|
|
#define thr_got_alarm(thr_alarm) (**(thr_alarm))
|
|
|
|
#endif /* __WIN__ */
|
|
|
|
typedef thr_alarm_entry* thr_alarm_t;
|
|
|
|
typedef struct st_alarm {
|
|
time_t expire_time;
|
|
thr_alarm_entry alarmed; /* set when alarm is due */
|
|
pthread_t thread;
|
|
my_thread_id thread_id;
|
|
uint index_in_queue;
|
|
my_bool malloced;
|
|
} ALARM;
|
|
|
|
extern uint thr_client_alarm;
|
|
extern pthread_t alarm_thread;
|
|
extern my_bool my_disable_thr_alarm;
|
|
|
|
#define thr_alarm_init(A) (*(A))=0
|
|
#define thr_alarm_in_use(A) (*(A)!= 0)
|
|
void init_thr_alarm(uint max_alarm);
|
|
void resize_thr_alarm(uint max_alarms);
|
|
my_bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff);
|
|
void thr_alarm_kill(my_thread_id thread_id);
|
|
void thr_end_alarm(thr_alarm_t *alarmed);
|
|
void end_thr_alarm(my_bool free_structures);
|
|
sig_handler process_alarm(int);
|
|
#ifndef thr_got_alarm
|
|
my_bool thr_got_alarm(thr_alarm_t *alrm);
|
|
#endif
|
|
|
|
|
|
#endif /* DONT_USE_THR_ALARM */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
#endif /* _thr_alarm_h */
|