mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
2901c3b8fa
Use server character set if --default-character-set is not used Added convert_string() for more efficient alloc+character-set convert of strings BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9: Delete: mysql-test/r/convert.result BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72: Delete: mysql-test/t/convert.test BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b: Delete: scripts/make_win_src_distribution.old client/mysql.cc: Use server character set if --default-character-set is not used client/mysqltest.c: Code cleanup (merge identical code) More debug messages heap/hp_create.c: After merge fix include/m_ctype.h: After merge fix include/my_global.h: Remove size_str (we already have size_s) include/mysql_com.h: After merge fix libmysql/libmysql.c: After merge fix libmysqld/Makefile.am: After merge fix mysql-test/r/auto_increment.result: After merge fix mysql-test/r/create.result: After merge fix mysql-test/r/ctype_latin1_de.result: After merge fix mysql-test/r/distinct.result: After merge fix mysql-test/r/drop.result: After merge fix mysql-test/r/fulltext.result: After merge fix mysql-test/r/func_gconcat.result: After merge fix mysql-test/r/func_str.result: After merge fix mysql-test/r/func_test.result: After merge fix mysql-test/r/grant.result: After merge fix mysql-test/r/group_by.result: After merge fix mysql-test/r/handler.result: After merge fix mysql-test/r/heap.result: After merge fix mysql-test/r/heap_btree.result: After merge fix mysql-test/r/heap_hash.result: After merge fix mysql-test/r/innodb.result: After merge fix mysql-test/r/insert.result: After merge fix mysql-test/r/insert_select.result: After merge fix mysql-test/r/join_outer.result: After merge fix mysql-test/r/key.result: After merge fix mysql-test/r/key_cache.result: After merge fix mysql-test/r/loaddata.result: After merge fix mysql-test/r/myisam.result: After merge fix mysql-test/r/null.result: After merge fix mysql-test/r/null_key.result: After merge fix mysql-test/r/order_by.result: After merge fix mysql-test/r/rpl_do_grant.result: After merge fix mysql-test/r/rpl_error_ignored_table.result: After merge fix mysql-test/r/rpl_ignore_grant.result: After merge fix mysql-test/r/rpl_loaddata.result: After merge fix mysql-test/r/rpl_log.result: After merge fix mysql-test/r/rpl_log_pos.result: After merge fix mysql-test/r/rpl_max_relay_size.result: After merge fix mysql-test/r/rpl_replicate_do.result: After merge fix mysql-test/r/rpl_reset_slave.result: After merge fix mysql-test/r/rpl_rotate_logs.result: After merge fix mysql-test/r/rpl_user_variables.result: After merge fix mysql-test/r/select.result: After merge fix mysql-test/r/select_safe.result: After merge fix mysql-test/r/subselect.result: After merge fix mysql-test/r/type_blob.result: After merge fix mysql-test/r/type_decimal.result: After merge fix mysql-test/r/type_float.result: After merge fix mysql-test/r/type_ranges.result: After merge fix mysql-test/r/type_time.result: After merge fix mysql-test/r/type_uint.result: After merge fix mysql-test/r/union.result: After merge fix mysql-test/r/warnings.result: After merge fix mysql-test/t/auto_increment.test: After merge fix mysql-test/t/case.test: After merge fix mysql-test/t/ctype_collate.test: After merge fix mysql-test/t/ctype_latin1_de.test: After merge fix mysql-test/t/drop.test: After merge fix mysql-test/t/func_in.test: After merge fix mysql-test/t/func_set.test: After merge fix mysql-test/t/func_str.test: After merge fix mysql-test/t/func_test.test: After merge fix mysql-test/t/grant.test: After merge fix mysql-test/t/group_by.test: After merge fix mysql-test/t/handler.test: After merge fix mysql-test/t/heap.test: After merge fix mysql-test/t/heap_btree.test: After merge fix mysql-test/t/heap_hash.test: After merge fix mysql-test/t/innodb.test: After merge fix mysql-test/t/insert_select.test: After merge fix mysql-test/t/key.test: After merge fix mysql-test/t/key_cache.test: After merge fix mysql-test/t/lock_tables_lost_commit-master.opt: After merge fix mysql-test/t/lock_tables_lost_commit.test: After merge fix mysql-test/t/myisam.test: After merge fix mysql-test/t/row.test: After merge fix mysql-test/t/subselect.test: After merge fix mysql-test/t/type_decimal.test: After merge fix mysql-test/t/type_ranges.test: After merge fix mysql-test/t/type_uint.test: After merge fix mysql-test/t/variables.test: After merge fix mysql-test/t/warnings.test: After merge fix scripts/make_win_src_distribution.sh: after merge fixes sql-common/client.c: After merge fix Change my_connect() to use poll() If character set is not given, use servers character set. sql/field.cc: After merge fix Don't give warnings when storing data in fields in optimizer. sql/ha_myisammrg.h: After merge fix sql/log.cc: After merge fix sql/log_event.cc: After merge fix sql/mysqld.cc: After merge fix sql/opt_range.cc: After merge fix sql/set_var.cc: Code cleanup Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps sql/set_var.h: Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps sql/slave.cc: After merge fix sql/sql_acl.cc: After merge fix Code cleanup sql/sql_class.cc: Added convert_string() for more efficient alloc+character-set convert of strings Add cached flags to avoid calling mysql_charset_same() during parsing. sql/sql_class.h: Added convert_string() for more efficient alloc+character-set convert of strings Add cached flags to avoid calling mysql_charset_same() during parsing. sql/sql_handler.cc: After merge fix sql/sql_lex.h: After merge fix sql/sql_parse.cc: Optimize and fix memory reference errors reported by valgrind sql/sql_repl.cc: After merge fix sql/sql_yacc.yy: After merge fix Avoid calling mysql_charset_same() when parsing identifiers strings/ctype-latin1.c: Port latin_de conversion code from 4.0
229 lines
7 KiB
C
229 lines
7 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 */
|
|
|
|
#include "heapdef.h"
|
|
|
|
static int keys_compare(heap_rb_param *param, uchar *key1, uchar *key2);
|
|
static void init_block(HP_BLOCK *block,uint reclength,ulong min_records,
|
|
ulong max_records);
|
|
|
|
int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
|
|
uint reclength, ulong max_records, ulong min_records,
|
|
HP_CREATE_INFO *create_info)
|
|
{
|
|
uint i, j, key_segs, max_length, length;
|
|
HP_SHARE *share;
|
|
HA_KEYSEG *keyseg;
|
|
|
|
DBUG_ENTER("heap_create");
|
|
pthread_mutex_lock(&THR_LOCK_heap);
|
|
|
|
if ((share= hp_find_named_heap(name)) && share->open_count == 0)
|
|
{
|
|
hp_free(share);
|
|
share= NULL;
|
|
}
|
|
|
|
if (!share)
|
|
{
|
|
HP_KEYDEF *keyinfo;
|
|
DBUG_PRINT("info",("Initializing new table"));
|
|
for (i= key_segs= max_length= 0, keyinfo= keydef; i < keys; i++, keyinfo++)
|
|
{
|
|
bzero((char*) &keyinfo->block,sizeof(keyinfo->block));
|
|
bzero((char*) &keyinfo->rb_tree ,sizeof(keyinfo->rb_tree));
|
|
for (j= length= 0; j < keyinfo->keysegs; j++)
|
|
{
|
|
length+= keyinfo->seg[j].length;
|
|
if (keyinfo->seg[j].null_bit)
|
|
{
|
|
length++;
|
|
if (!(keyinfo->flag & HA_NULL_ARE_EQUAL))
|
|
keyinfo->flag|= HA_NULL_PART_KEY;
|
|
if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
|
|
keyinfo->rb_tree.size_of_element++;
|
|
}
|
|
switch (keyinfo->seg[j].type) {
|
|
case HA_KEYTYPE_SHORT_INT:
|
|
case HA_KEYTYPE_LONG_INT:
|
|
case HA_KEYTYPE_FLOAT:
|
|
case HA_KEYTYPE_DOUBLE:
|
|
case HA_KEYTYPE_USHORT_INT:
|
|
case HA_KEYTYPE_ULONG_INT:
|
|
case HA_KEYTYPE_LONGLONG:
|
|
case HA_KEYTYPE_ULONGLONG:
|
|
case HA_KEYTYPE_INT24:
|
|
case HA_KEYTYPE_UINT24:
|
|
case HA_KEYTYPE_INT8:
|
|
keyinfo->seg[j].flag|= HA_SWAP_KEY;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
keyinfo->length= length;
|
|
length+= keyinfo->rb_tree.size_of_element +
|
|
((keyinfo->algorithm == HA_KEY_ALG_BTREE) ? sizeof(byte*) : 0);
|
|
if (length > max_length)
|
|
max_length= length;
|
|
key_segs+= keyinfo->keysegs;
|
|
if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
|
|
{
|
|
key_segs++; /* additional HA_KEYTYPE_END segment */
|
|
if (keyinfo->flag & HA_NULL_PART_KEY)
|
|
keyinfo->get_key_length= hp_rb_null_key_length;
|
|
else
|
|
keyinfo->get_key_length= hp_rb_key_length;
|
|
}
|
|
}
|
|
if (!(share= (HP_SHARE*) my_malloc((uint) sizeof(HP_SHARE)+
|
|
keys*sizeof(HP_KEYDEF)+
|
|
key_segs*sizeof(HA_KEYSEG),
|
|
MYF(MY_ZEROFILL))))
|
|
{
|
|
pthread_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(1);
|
|
}
|
|
share->keydef= (HP_KEYDEF*) (share + 1);
|
|
keyseg= (HA_KEYSEG*) (share->keydef + keys);
|
|
init_block(&share->block, reclength + 1, min_records, max_records);
|
|
/* Fix keys */
|
|
memcpy(share->keydef, keydef, (size_t) (sizeof(keydef[0]) * keys));
|
|
for (i= 0, keyinfo= share->keydef; i < keys; i++, keyinfo++)
|
|
{
|
|
keyinfo->seg= keyseg;
|
|
memcpy(keyseg, keydef[i].seg,
|
|
(size_t) (sizeof(keyseg[0]) * keydef[i].keysegs));
|
|
keyseg+= keydef[i].keysegs;
|
|
|
|
if (keydef[i].algorithm == HA_KEY_ALG_BTREE)
|
|
{
|
|
/* additional HA_KEYTYPE_END keyseg */
|
|
keyseg->type= HA_KEYTYPE_END;
|
|
keyseg->length= sizeof(byte*);
|
|
keyseg->flag= 0;
|
|
keyseg->null_bit= 0;
|
|
keyseg++;
|
|
|
|
init_tree(&keyinfo->rb_tree, 0, 0, sizeof(byte*),
|
|
(qsort_cmp2)keys_compare, 1, NULL, NULL);
|
|
keyinfo->delete_key= hp_rb_delete_key;
|
|
keyinfo->write_key= hp_rb_write_key;
|
|
}
|
|
else
|
|
{
|
|
init_block(&keyinfo->block, sizeof(HASH_INFO), min_records,
|
|
max_records);
|
|
keyinfo->delete_key= hp_delete_key;
|
|
keyinfo->write_key= hp_write_key;
|
|
}
|
|
}
|
|
share->min_records= min_records;
|
|
share->max_records= max_records;
|
|
share->data_length= share->index_length= 0;
|
|
share->reclength= reclength;
|
|
share->blength= 1;
|
|
share->keys= keys;
|
|
share->max_key_length= max_length;
|
|
share->changed= 0;
|
|
share->auto_key= create_info->auto_key;
|
|
share->auto_key_type= create_info->auto_key_type;
|
|
share->auto_increment= create_info->auto_increment;
|
|
/* Must be allocated separately for rename to work */
|
|
if (!(share->name= my_strdup(name,MYF(0))))
|
|
{
|
|
my_free((gptr) share,MYF(0));
|
|
pthread_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(1);
|
|
}
|
|
#ifdef THREAD
|
|
thr_lock_init(&share->lock);
|
|
VOID(pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST));
|
|
#endif
|
|
share->open_list.data= (void*) share;
|
|
heap_share_list= list_add(heap_share_list,&share->open_list);
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(0);
|
|
} /* heap_create */
|
|
|
|
static int keys_compare(heap_rb_param *param, uchar *key1, uchar *key2)
|
|
{
|
|
uint not_used;
|
|
return ha_key_cmp(param->keyseg, key1, key2, param->key_length,
|
|
param->search_flag, ¬_used);
|
|
}
|
|
|
|
static void init_block(HP_BLOCK *block, uint reclength, ulong min_records,
|
|
ulong max_records)
|
|
{
|
|
uint i,recbuffer,records_in_block;
|
|
|
|
max_records= max(min_records,max_records);
|
|
if (!max_records)
|
|
max_records= 1000; /* As good as quess as anything */
|
|
recbuffer= (uint) (reclength + sizeof(byte**) - 1) & ~(sizeof(byte**) - 1);
|
|
records_in_block= max_records / 10;
|
|
if (records_in_block < 10 && max_records)
|
|
records_in_block= 10;
|
|
if (!records_in_block || records_in_block*recbuffer >
|
|
(my_default_record_cache_size-sizeof(HP_PTRS)*HP_MAX_LEVELS))
|
|
records_in_block= (my_default_record_cache_size - sizeof(HP_PTRS) *
|
|
HP_MAX_LEVELS) / recbuffer + 1;
|
|
block->records_in_block= records_in_block;
|
|
block->recbuffer= recbuffer;
|
|
block->last_allocated= 0L;
|
|
|
|
for (i= 0; i <= HP_MAX_LEVELS; i++)
|
|
block->level_info[i].records_under_level=
|
|
(!i ? 1 : i == 1 ? records_in_block :
|
|
HP_PTRS_IN_NOD * block->level_info[i - 1].records_under_level);
|
|
}
|
|
|
|
int heap_delete_table(const char *name)
|
|
{
|
|
int result;
|
|
reg1 HP_SHARE *share;
|
|
DBUG_ENTER("heap_delete_table");
|
|
|
|
pthread_mutex_lock(&THR_LOCK_heap);
|
|
if ((share= hp_find_named_heap(name)))
|
|
{
|
|
if (share->open_count == 0)
|
|
hp_free(share);
|
|
else
|
|
share->delete_on_close= 1;
|
|
result= 0;
|
|
}
|
|
else
|
|
{
|
|
result= my_errno=ENOENT;
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(result);
|
|
}
|
|
|
|
void hp_free(HP_SHARE *share)
|
|
{
|
|
heap_share_list= list_delete(heap_share_list, &share->open_list);
|
|
hp_clear(share); /* Remove blocks from memory */
|
|
#ifdef THREAD
|
|
thr_lock_delete(&share->lock);
|
|
VOID(pthread_mutex_destroy(&share->intern_lock));
|
|
#endif
|
|
my_free((gptr) share->name, MYF(0));
|
|
my_free((gptr) share, MYF(0));
|
|
return;
|
|
}
|