mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f631b361b6
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
187 lines
7.2 KiB
C
187 lines
7.2 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
|
|
/* Extra functions used by unireg library */
|
|
|
|
#ifndef _unireg_h
|
|
|
|
#ifndef NO_ALARM_LOOP
|
|
#define NO_ALARM_LOOP /* lib5 and popen can't use alarm */
|
|
#endif
|
|
|
|
/* These paths are converted to other systems (WIN95) before use */
|
|
|
|
#define LANGUAGE "english/"
|
|
#define ERRMSG_FILE "errmsg.sys"
|
|
#define TEMP_PREFIX "MY"
|
|
#define LOG_PREFIX "ML"
|
|
#define PROGDIR "bin/"
|
|
#ifndef DATADIR
|
|
#define DATADIR "data/"
|
|
#endif
|
|
#ifndef SHAREDIR
|
|
#define SHAREDIR "share/"
|
|
#endif
|
|
#ifndef LIBDIR
|
|
#define LIBDIR "lib/"
|
|
#endif
|
|
|
|
#define ER(X) errmesg[(X) - ER_ERROR_FIRST]
|
|
#define ER_SAFE(X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER(X) : "Invalid error code")
|
|
|
|
|
|
#define ERRMAPP 1 /* Errormap f|r my_error */
|
|
#define LIBLEN FN_REFLEN-FN_LEN /* Max l{ngd p} dev */
|
|
#define MAX_DBKEY_LENGTH (FN_LEN*2+1+1+4+4) /* extra 4+4 bytes for slave tmp
|
|
* tables */
|
|
#define MAX_ALIAS_NAME 256
|
|
#define MAX_FIELD_NAME 34 /* Max colum name length +2 */
|
|
#define MAX_SYS_VAR_LENGTH 32
|
|
#define MAX_KEY 64 /* Max used keys */
|
|
#define MAX_REF_PARTS 16 /* Max parts used as ref */
|
|
#if SIZEOF_CHARP > 4
|
|
#define MAX_KEY_LENGTH 3072 /* max possible key, if 64 bits */
|
|
#else
|
|
#define MAX_KEY_LENGTH 1024 /* max possible key, if 32 bits */
|
|
#endif
|
|
#if SIZEOF_OFF_T > 4
|
|
#define MAX_REFLENGTH 8 /* Max length for record ref */
|
|
#else
|
|
#define MAX_REFLENGTH 4 /* Max length for record ref */
|
|
#endif
|
|
#define MAX_HOSTNAME 61 /* len+1 in mysql.user */
|
|
|
|
#define MAX_MBWIDTH 3 /* Max multibyte sequence */
|
|
#define MAX_FIELD_CHARLENGTH 255
|
|
#define MAX_FIELD_VARCHARLENGTH 65535
|
|
#define CONVERT_IF_BIGGER_TO_BLOB 512 /* Used for CREATE ... SELECT */
|
|
|
|
/* Max column width +1 */
|
|
#define MAX_FIELD_WIDTH (MAX_FIELD_CHARLENGTH*MAX_MBWIDTH+1)
|
|
|
|
#define MAX_BIT_FIELD_LENGTH 64 /* Max length in bits for bit fields */
|
|
|
|
#define MAX_DATE_WIDTH 10 /* YYYY-MM-DD */
|
|
#define MAX_TIME_WIDTH 23 /* -DDDDDD HH:MM:SS.###### */
|
|
#define MAX_DATETIME_FULL_WIDTH 29 /* YYYY-MM-DD HH:MM:SS.###### AM */
|
|
#define MAX_DATETIME_WIDTH 19 /* YYYY-MM-DD HH:MM:SS */
|
|
|
|
#define MAX_TABLES (sizeof(table_map)*8-3) /* Max tables in join */
|
|
#define PARAM_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-3))
|
|
#define OUTER_REF_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-2))
|
|
#define RAND_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-1))
|
|
#define PSEUDO_TABLE_BITS (PARAM_TABLE_BIT | OUTER_REF_TABLE_BIT | \
|
|
RAND_TABLE_BIT)
|
|
#define MAX_FIELDS 4096 /* Limit in the .frm file */
|
|
#define MAX_PARTITIONS 1024
|
|
|
|
#define MAX_SORT_MEMORY (2048*1024-MALLOC_OVERHEAD)
|
|
#define MIN_SORT_MEMORY (32*1024-MALLOC_OVERHEAD)
|
|
|
|
/* Memory allocated when parsing a statement / saving a statement */
|
|
#define MEM_ROOT_BLOCK_SIZE 8192
|
|
#define MEM_ROOT_PREALLOC 8192
|
|
#define TRANS_MEM_ROOT_BLOCK_SIZE 4096
|
|
#define TRANS_MEM_ROOT_PREALLOC 4096
|
|
|
|
#define DEFAULT_ERROR_COUNT 64
|
|
#define EXTRA_RECORDS 10 /* Extra records in sort */
|
|
#define SCROLL_EXTRA 5 /* Extra scroll-rows. */
|
|
#define FIELD_NAME_USED ((uint) 32768) /* Bit set if fieldname used */
|
|
#define FORM_NAME_USED ((uint) 16384) /* Bit set if formname used */
|
|
#define FIELD_NR_MASK 16383 /* To get fieldnumber */
|
|
#define FERR -1 /* Error from my_functions */
|
|
#define CREATE_MODE 0 /* Default mode on new files */
|
|
#define NAMES_SEP_CHAR '\377' /* Char to sep. names */
|
|
|
|
#define READ_RECORD_BUFFER (uint) (IO_SIZE*8) /* Pointer_buffer_size */
|
|
#define DISK_BUFFER_SIZE (uint) (IO_SIZE*16) /* Size of diskbuffer */
|
|
#define POSTFIX_ERROR DBL_MAX
|
|
|
|
#define ME_INFO (ME_HOLDTANG+ME_OLDWIN+ME_NOREFRESH)
|
|
#define ME_ERROR (ME_BELL+ME_OLDWIN+ME_NOREFRESH)
|
|
#define MYF_RW MYF(MY_WME+MY_NABP) /* Vid my_read & my_write */
|
|
|
|
#define SPECIAL_USE_LOCKS 1 /* Lock used databases */
|
|
#define SPECIAL_NO_NEW_FUNC 2 /* Skip new functions */
|
|
#define SPECIAL_SKIP_SHOW_DB 4 /* Don't allow 'show db' */
|
|
#define SPECIAL_WAIT_IF_LOCKED 8 /* Wait if locked database */
|
|
#define SPECIAL_SAME_DB_NAME 16 /* form name = file name */
|
|
#define SPECIAL_ENGLISH 32 /* English error messages */
|
|
#define SPECIAL_NO_RESOLVE 64 /* Don't use gethostname */
|
|
#define SPECIAL_NO_PRIOR 128 /* Don't prioritize threads */
|
|
#define SPECIAL_BIG_SELECTS 256 /* Don't use heap tables */
|
|
#define SPECIAL_NO_HOST_CACHE 512 /* Don't cache hosts */
|
|
#define SPECIAL_SHORT_LOG_FORMAT 1024
|
|
#define SPECIAL_SAFE_MODE 2048
|
|
#define SPECIAL_LOG_QUERIES_NOT_USING_INDEXES 4096 /* Log q not using indexes */
|
|
|
|
/* Extern defines */
|
|
#define store_record(A,B) bmove_align((A)->B,(A)->record[0],(size_t) (A)->s->reclength)
|
|
#define restore_record(A,B) bmove_align((A)->record[0],(A)->B,(size_t) (A)->s->reclength)
|
|
#define cmp_record(A,B) memcmp((A)->record[0],(A)->B,(size_t) (A)->s->reclength)
|
|
#define empty_record(A) { \
|
|
restore_record((A),s->default_values); \
|
|
bfill((A)->null_flags,(A)->s->null_bytes,255);\
|
|
}
|
|
|
|
/* Defines for use with openfrm, openprt and openfrd */
|
|
|
|
#define READ_ALL 1 /* openfrm: Read all parameters */
|
|
#define CHANGE_FRM 2 /* openfrm: open .frm as O_RDWR */
|
|
#define READ_KEYINFO 4 /* L{s nyckeldata fr}n filen */
|
|
#define EXTRA_RECORD 8 /* Reservera plats f|r extra record */
|
|
#define DONT_OPEN_TABLES 8 /* Don't open database-files (frd) */
|
|
#define DONT_OPEN_MASTER_REG 16 /* Don't open first reg-file (prt) */
|
|
#define EXTRA_LONG_RECORD 16 /* Plats f|r dubbel s|k-record */
|
|
#define COMPUTE_TYPES 32 /* Kontrollera type f|r f{ltena */
|
|
#define SEARCH_PRG 64 /* S|k efter registret i 'prg_dev' */
|
|
#define READ_USED_NAMES 128 /* L{s anv{nda formul{rnamn */
|
|
#define DONT_GIVE_ERROR 256 /* Don't do frm_error on openfrm */
|
|
#define READ_SCREENS 1024 /* Read screens, info and helpfile */
|
|
#define DELAYED_OPEN 4096 /* Open table later */
|
|
#define OPEN_VIEW 8192 /* Allow open on view */
|
|
|
|
#define SC_INFO_LENGTH 4 /* Form format constant */
|
|
#define TE_INFO_LENGTH 3
|
|
#define MTYP_NOEMPTY_BIT 128
|
|
|
|
#define FRM_VER_TRUE_VARCHAR (FRM_VER+4) /* 10 */
|
|
/*
|
|
Minimum length pattern before Turbo Boyer-Moore is used
|
|
for SELECT "text" LIKE "%pattern%", excluding the two
|
|
wildcards in class Item_func_like.
|
|
*/
|
|
#define MIN_TURBOBM_PATTERN_LEN 3
|
|
|
|
/*
|
|
Defines for binary logging.
|
|
Do not decrease the value of BIN_LOG_HEADER_SIZE.
|
|
Do not even increase it before checking code.
|
|
*/
|
|
|
|
#define BIN_LOG_HEADER_SIZE 4
|
|
#define FLOATING_POINT_BUFFER 331
|
|
|
|
#define DEFAULT_KEY_CACHE_NAME "default"
|
|
|
|
/* Include prototypes for unireg */
|
|
|
|
#include "mysqld_error.h"
|
|
#include "structs.h" /* All structs we need */
|
|
|
|
#endif
|