mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
09a53f28a7
Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() BUILD/compile-solaris-sparc-forte: Updated script to current Solaris installations Now we compile by default for 64 bits client/mysql.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysql_upgrade.c: Fixed compiler warning (on Forte) client/mysqladmin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysqlcheck.c: Fixed compiler warning (on Forte) client/mysqldump.c: Fixed compiler warning (on Forte) client/mysqlslap.c: Fixed compiler warning (on Forte) client/mysqltest.c: Fixed compiler warning (on Forte) client/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ configure.in: Added detection of mtmalloc and ieeefp.h extra/replace.c: Fixed compiler warning (on Forte) include/m_ctype.h: Added some typedef's to make it easy to use C function pointers in C++ include/my_sys.h: Added my_file_total_opened (counter for calls to my_open()) include/myisam.h: Fixed compiler warning (on Forte) libmysql/libmysql.c: Fixed compiler warning (on Forte) by adding casts and change types libmysql/manager.c: Fixed compiler warning (on Forte) by adding casts and change types mysql-test/r/ctype_cp932_binlog_stm.result: Updated positions (Needed because we didn't before correctly restore collation_database after running stored procedure mysys/my_fopen.c: Count number of opened files mysys/my_open.c: Count number of opened files mysys/my_static.c: Count number of opened files mysys/thr_alarm.c: Optimization to do less alarm() and pthread_sigmask() calls. Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one. Before we only did this if there was other pending alarms. We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm() signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm() regex/regcomp.c: Fixed compiler warning (on Forte) by adding casts and change types scripts/mysql_install_db.sh: Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL Don't give (unnecessary) warnings server-tools/instance-manager/angel.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) server-tools/instance-manager/thread_registry.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/event_db_repository.cc: index_read() -> index_read_map() sql/event_queue.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/field.cc: Fixed compiler warnings about hidden fields sql/ha_partition.cc: Fixed compiler warnings about hidden fields index_read() -> index_read_map() sql/ha_partition.h: index_read() -> index_read_map() sql/handler.cc: Added PAGE option to row types (to prepare for future) index_read() -> index_read_map() sql/handler.h: Added ROW_TYPE_PAGE (for future) Added flag to signal if table was to be created transactionally I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() sql/item.cc: Fixed indentation Renamed local variable to avoid hiding class variable sql/item_cmpfunc.cc: Renamed local variable to avoid hiding class variable sql/item_cmpfunc.h: Removed not used variable sql/item_func.cc: Renamed local variable to avoid hiding class variable sql/item_strfunc.cc: Moved functions from Item_strfunc.cc sql/item_strfunc.h: Move functions to item_strfunc.cc Use C function pointer type to avoid compiler warnings (with Forte) sql/item_subselect.cc: index_read() -> index_read_map() sql/item_xmlfunc.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/key.cc: Fixed indentation sql/log.cc: Renamed local variable to avoid hiding class variable sql/log_event.cc: Removed call to my_time() when creating class instance of Log_event() as this may have static instances. (One can't call my_time() before my_init()) index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/log_event_old.cc: Renamed local variable to avoid hiding class variable sql/mysql_priv.h: Made all create_backup_ctx() declarations identical. This lifted up a bug where wrong create_backup_ctx() was called in some cases. Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/mysqld.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Fixed indentation Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm() Added variable 'Opened_files' (number of calls to my_open() or my_fopen()) Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db) Fixed compiler warnings sql/opt_range.cc: index_read() -> index_read_map() sql/opt_sum.cc: index_read() -> index_read_map() sql/partition_info.cc: Renamed local variable to avoid hiding class variable sql/rpl_filter.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/set_var.cc: Renamed local variable to avoid hiding class variable Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/set_var.h: Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/sp.cc: More debugging index_read() -> index_read_map() sql/sp_cache.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sp_head.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx() sql/sql_acl.cc: index_read() -> index_read_map() sql/sql_class.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_class.h: Renamed local variable to avoid hiding class variable sql/sql_db.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_delete.cc: Renamed local variable to avoid hiding class variable sql/sql_handler.cc: index_read() -> index_read_map() sql/sql_help.cc: index_read() -> index_read_map() sql/sql_insert.cc: index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/sql_lex.cc: Renamed local variable to avoid hiding class variable sql/sql_plugin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) index_read() -> index_read_map() Don't give warnings about not used plugins if we are using --warnings=0 sql/sql_select.cc: index_read() -> index_read_map() sql-common/client.c: Fixed compiler warning (on Forte) sql-common/my_time.c: Removed never accessed code Fixed compiler warning (on Forte) sql/sql_servers.cc: index_read() -> index_read_map() sql/sql_show.cc: Added TRANSACTIONAL to SHOW CREATE Fixed ROW_TYPE_PAGE sql/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ sql/sql_table.cc: Set create_info->transactional if we used TRANSACTIONAL=1 sql/sql_udf.cc: index_read() -> index_read_map() sql/sql_yacc.yy: Added TRANSACTIONAL=0|1 to CREATE (for future) Added row type PAGE (was only partionally handled before) sql/strfunc.cc: Avoid compiler warnings when using C function pointers in C++ sql/table.cc: More DBUG statements Declare all create_backup_ctx() functions identically Remember if table was created with TRANSACTIONAL flag or not (future safe) Renamed local variable to avoid hiding class variable sql/table.h: Remember if table was created with TRANSACTIONAL=1 sql/tztime.cc: index_read() -> index_read_map() sql-common/pack.c: Fixed compiler warning (on Forte) storage/archive/archive_reader.c: Fixed compiler warning (on Forte) storage/archive/azio.c: Fixed compiler warning (on Forte) storage/blackhole/ha_blackhole.cc: index_read() -> index_read_map() storage/blackhole/ha_blackhole.h: index_read() -> index_read_map() storage/csv/ha_tina.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) storage/example/ha_example.cc: index_read() -> index_read_map() storage/example/ha_example.h: index_read() -> index_read_map() storage/heap/ha_heap.cc: index_read() -> index_read_map() storage/heap/ha_heap.h: index_read() -> index_read_map() storage/heap/hp_test1.c: Fixed compiler warning (on Forte) storage/heap/hp_test2.c: Fixed compiler warning (on Forte) storage/myisam/ft_boolean_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_nlq_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_parser.c: Fixed compiler warning (on Forte) storage/myisam/ft_stopwords.c: Fixed compiler warning (on Forte) storage/myisam/ha_myisam.cc: index_read() -> index_read_map() storage/myisam/ha_myisam.h: index_read() -> index_read_map() storage/myisam/mi_check.c: Fixed compiler warning (on Forte) storage/myisam/mi_delete.c: Fixed compiler warning (on Forte) storage/myisam/mi_dynrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_extra.c: Fixed compiler warning (on Forte) storage/myisam/mi_key.c: Fixed compiler warning (on Forte) storage/myisam/mi_keycache.c: Fixed compiler warning (on Forte) storage/myisam/mi_locking.c: Fixed compiler warning (on Forte) storage/myisam/mi_log.c: Fixed compiler warning (on Forte) storage/myisam/mi_open.c: Fixed compiler warning (on Forte) storage/myisam/mi_packrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_page.c: Fixed compiler warning (on Forte) storage/myisam/mi_rkey.c: Added comment storage/myisam/mi_search.c: Fixed compiler warning (on Forte) storage/myisam/mi_statrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_test1.c: Fixed compiler warning (on Forte) storage/myisam/mi_test2.c: Fixed compiler warning (on Forte) storage/myisam/mi_test3.c: Fixed compiler warning (on Forte) storage/myisam/mi_update.c: Fixed compiler warning (on Forte) storage/myisam/mi_write.c: Fixed compiler warning (on Forte) storage/myisam/myisamdef.h: Fixed that file_read/file_write returns type size_t Changed some functions to use uchar * as argument/return value instead of char* This fixed some compiler warnings on Forte storage/myisam/myisamlog.c: Fixed compiler warning (on Forte) storage/myisam/myisampack.c: Fixed compiler warning (on Forte) storage/myisam/rt_test.c: Fixed compiler warning (on Forte) storage/myisam/sort.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisam/sp_test.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisammrg/ha_myisammrg.cc: index_read() -> index_read_map() storage/myisammrg/ha_myisammrg.h: index_read() -> index_read_map() storage/myisammrg/myrg_create.c: Fixed compiler warning (on Forte) by adding casts or changing variable types storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Tdummy -> align (as in other part of cluster code) storage/ndb/src/kernel/vm/DynArr256.cpp: Removed not used variable storage/ndb/src/ndbapi/Ndb.cpp: Removed not used variable strings/strtod.c: Include ieeefp.h to avoid compiler warning tests/bug25714.c: Fixed compiler warning tests/mysql_client_test.c: Remove not used variable Fixed indentation Removed never reached code Fixed compiler warning (on Forte) by adding casts or changing variable types vio/viosocket.c: Fixed compiler warning (on Forte) by adding casts or changing variable types
903 lines
20 KiB
C++
903 lines
20 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 */
|
|
|
|
/* This file is originally from the mysql distribution. Coded by monty */
|
|
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
|
#pragma implementation // gcc: Class implementation
|
|
#endif
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#ifdef HAVE_FCONVERT
|
|
#include <floatingpoint.h>
|
|
#endif
|
|
|
|
/*
|
|
The following extern declarations are ok as these are interface functions
|
|
required by the string function
|
|
*/
|
|
|
|
extern void sql_alloc(size_t size);
|
|
extern void sql_element_free(void *ptr);
|
|
|
|
#include "sql_string.h"
|
|
|
|
/*****************************************************************************
|
|
** String functions
|
|
*****************************************************************************/
|
|
|
|
bool String::real_alloc(uint32 arg_length)
|
|
{
|
|
arg_length=ALIGN_SIZE(arg_length+1);
|
|
str_length=0;
|
|
if (Alloced_length < arg_length)
|
|
{
|
|
free();
|
|
if (!(Ptr=(char*) my_malloc(arg_length,MYF(MY_WME))))
|
|
return TRUE;
|
|
Alloced_length=arg_length;
|
|
alloced=1;
|
|
}
|
|
Ptr[0]=0;
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
** Check that string is big enough. Set string[alloc_length] to 0
|
|
** (for C functions)
|
|
*/
|
|
|
|
bool String::realloc(uint32 alloc_length)
|
|
{
|
|
uint32 len=ALIGN_SIZE(alloc_length+1);
|
|
if (Alloced_length < len)
|
|
{
|
|
char *new_ptr;
|
|
if (alloced)
|
|
{
|
|
if ((new_ptr= (char*) my_realloc(Ptr,len,MYF(MY_WME))))
|
|
{
|
|
Ptr=new_ptr;
|
|
Alloced_length=len;
|
|
}
|
|
else
|
|
return TRUE; // Signal error
|
|
}
|
|
else if ((new_ptr= (char*) my_malloc(len,MYF(MY_WME))))
|
|
{
|
|
if (str_length) // Avoid bugs in memcpy on AIX
|
|
memcpy(new_ptr,Ptr,str_length);
|
|
new_ptr[str_length]=0;
|
|
Ptr=new_ptr;
|
|
Alloced_length=len;
|
|
alloced=1;
|
|
}
|
|
else
|
|
return TRUE; // Signal error
|
|
}
|
|
Ptr[alloc_length]=0; // This make other funcs shorter
|
|
return FALSE;
|
|
}
|
|
|
|
bool String::set(longlong num, CHARSET_INFO *cs)
|
|
{
|
|
uint l=20*cs->mbmaxlen+1;
|
|
|
|
if (alloc(l))
|
|
return TRUE;
|
|
str_length=(uint32) (cs->cset->longlong10_to_str)(cs,Ptr,l,-10,num);
|
|
str_charset=cs;
|
|
return FALSE;
|
|
}
|
|
|
|
bool String::set(ulonglong num, CHARSET_INFO *cs)
|
|
{
|
|
uint l=20*cs->mbmaxlen+1;
|
|
|
|
if (alloc(l))
|
|
return TRUE;
|
|
str_length=(uint32) (cs->cset->longlong10_to_str)(cs,Ptr,l,10,num);
|
|
str_charset=cs;
|
|
return FALSE;
|
|
}
|
|
|
|
bool String::set(double num,uint decimals, CHARSET_INFO *cs)
|
|
{
|
|
char buff[331];
|
|
uint dummy_errors;
|
|
|
|
str_charset=cs;
|
|
if (decimals >= NOT_FIXED_DEC)
|
|
{
|
|
uint32 len= my_sprintf(buff,(buff, "%.14g",num));// Enough for a DATETIME
|
|
return copy(buff, len, &my_charset_latin1, cs, &dummy_errors);
|
|
}
|
|
#ifdef HAVE_FCONVERT
|
|
int decpt,sign;
|
|
char *pos,*to;
|
|
|
|
VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
|
|
if (!my_isdigit(&my_charset_latin1, buff[1]))
|
|
{ // Nan or Inf
|
|
pos=buff+1;
|
|
if (sign)
|
|
{
|
|
buff[0]='-';
|
|
pos=buff;
|
|
}
|
|
uint dummy_errors;
|
|
return copy(pos,(uint32) strlen(pos), &my_charset_latin1, cs, &dummy_errors);
|
|
}
|
|
if (alloc((uint32) ((uint32) decpt+3+decimals)))
|
|
return TRUE;
|
|
to=Ptr;
|
|
if (sign)
|
|
*to++='-';
|
|
|
|
pos=buff+1;
|
|
if (decpt < 0)
|
|
{ /* value is < 0 */
|
|
*to++='0';
|
|
if (!decimals)
|
|
goto end;
|
|
*to++='.';
|
|
if ((uint32) -decpt > decimals)
|
|
decpt= - (int) decimals;
|
|
decimals=(uint32) ((int) decimals+decpt);
|
|
while (decpt++ < 0)
|
|
*to++='0';
|
|
}
|
|
else if (decpt == 0)
|
|
{
|
|
*to++= '0';
|
|
if (!decimals)
|
|
goto end;
|
|
*to++='.';
|
|
}
|
|
else
|
|
{
|
|
while (decpt-- > 0)
|
|
*to++= *pos++;
|
|
if (!decimals)
|
|
goto end;
|
|
*to++='.';
|
|
}
|
|
while (decimals--)
|
|
*to++= *pos++;
|
|
|
|
end:
|
|
*to=0;
|
|
str_length=(uint32) (to-Ptr);
|
|
return FALSE;
|
|
#else
|
|
#ifdef HAVE_SNPRINTF
|
|
buff[sizeof(buff)-1]=0; // Safety
|
|
snprintf(buff,sizeof(buff)-1, "%.*f",(int) decimals,num);
|
|
#else
|
|
sprintf(buff,"%.*f",(int) decimals,num);
|
|
#endif
|
|
return copy(buff,(uint32) strlen(buff), &my_charset_latin1, cs,
|
|
&dummy_errors);
|
|
#endif
|
|
}
|
|
|
|
|
|
bool String::copy()
|
|
{
|
|
if (!alloced)
|
|
{
|
|
Alloced_length=0; // Force realloc
|
|
return realloc(str_length);
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
bool String::copy(const String &str)
|
|
{
|
|
if (alloc(str.str_length))
|
|
return TRUE;
|
|
str_length=str.str_length;
|
|
bmove(Ptr,str.Ptr,str_length); // May be overlapping
|
|
Ptr[str_length]=0;
|
|
str_charset=str.str_charset;
|
|
return FALSE;
|
|
}
|
|
|
|
bool String::copy(const char *str,uint32 arg_length, CHARSET_INFO *cs)
|
|
{
|
|
if (alloc(arg_length))
|
|
return TRUE;
|
|
if ((str_length=arg_length))
|
|
memcpy(Ptr,str,arg_length);
|
|
Ptr[arg_length]=0;
|
|
str_charset=cs;
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Checks that the source string can be just copied to the destination string
|
|
without conversion.
|
|
|
|
SYNPOSIS
|
|
|
|
needs_conversion()
|
|
arg_length Length of string to copy.
|
|
from_cs Character set to copy from
|
|
to_cs Character set to copy to
|
|
uint32 *offset Returns number of unaligned characters.
|
|
|
|
RETURN
|
|
0 No conversion needed
|
|
1 Either character set conversion or adding leading zeros
|
|
(e.g. for UCS-2) must be done
|
|
|
|
NOTE
|
|
to_cs may be NULL for "no conversion" if the system variable
|
|
character_set_results is NULL.
|
|
*/
|
|
|
|
bool String::needs_conversion(uint32 arg_length,
|
|
CHARSET_INFO *from_cs,
|
|
CHARSET_INFO *to_cs,
|
|
uint32 *offset)
|
|
{
|
|
*offset= 0;
|
|
if (!to_cs ||
|
|
(to_cs == &my_charset_bin) ||
|
|
(to_cs == from_cs) ||
|
|
my_charset_same(from_cs, to_cs) ||
|
|
((from_cs == &my_charset_bin) &&
|
|
(!(*offset=(arg_length % to_cs->mbminlen)))))
|
|
return FALSE;
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/*
|
|
Copy a multi-byte character sets with adding leading zeros.
|
|
|
|
SYNOPSIS
|
|
|
|
copy_aligned()
|
|
str String to copy
|
|
arg_length Length of string. This should NOT be dividable with
|
|
cs->mbminlen.
|
|
offset arg_length % cs->mb_minlength
|
|
cs Character set for 'str'
|
|
|
|
NOTES
|
|
For real multi-byte, ascii incompatible charactser sets,
|
|
like UCS-2, add leading zeros if we have an incomplete character.
|
|
Thus,
|
|
SELECT _ucs2 0xAA
|
|
will automatically be converted into
|
|
SELECT _ucs2 0x00AA
|
|
|
|
RETURN
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
bool String::copy_aligned(const char *str,uint32 arg_length, uint32 offset,
|
|
CHARSET_INFO *cs)
|
|
{
|
|
/* How many bytes are in incomplete character */
|
|
offset= cs->mbmaxlen - offset; /* How many zeros we should prepend */
|
|
DBUG_ASSERT(offset && offset != cs->mbmaxlen);
|
|
|
|
uint32 aligned_length= arg_length + offset;
|
|
if (alloc(aligned_length))
|
|
return TRUE;
|
|
|
|
/*
|
|
Note, this is only safe for little-endian UCS-2.
|
|
If we add big-endian UCS-2 sometimes, this code
|
|
will be more complicated. But it's OK for now.
|
|
*/
|
|
bzero((char*) Ptr, offset);
|
|
memcpy(Ptr + offset, str, arg_length);
|
|
Ptr[aligned_length]=0;
|
|
/* str_length is always >= 0 as arg_length is != 0 */
|
|
str_length= aligned_length;
|
|
str_charset= cs;
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
bool String::set_or_copy_aligned(const char *str,uint32 arg_length,
|
|
CHARSET_INFO *cs)
|
|
{
|
|
/* How many bytes are in incomplete character */
|
|
uint32 offset= (arg_length % cs->mbminlen);
|
|
|
|
if (!offset) /* All characters are complete, just copy */
|
|
{
|
|
set(str, arg_length, cs);
|
|
return FALSE;
|
|
}
|
|
return copy_aligned(str, arg_length, offset, cs);
|
|
}
|
|
|
|
/* Copy with charset convertion */
|
|
|
|
bool String::copy(const char *str, uint32 arg_length,
|
|
CHARSET_INFO *from_cs, CHARSET_INFO *to_cs, uint *errors)
|
|
{
|
|
uint32 offset;
|
|
if (!needs_conversion(arg_length, from_cs, to_cs, &offset))
|
|
{
|
|
*errors= 0;
|
|
return copy(str, arg_length, to_cs);
|
|
}
|
|
if ((from_cs == &my_charset_bin) && offset)
|
|
{
|
|
*errors= 0;
|
|
return copy_aligned(str, arg_length, offset, to_cs);
|
|
}
|
|
uint32 new_length= to_cs->mbmaxlen*arg_length;
|
|
if (alloc(new_length))
|
|
return TRUE;
|
|
str_length=copy_and_convert((char*) Ptr, new_length, to_cs,
|
|
str, arg_length, from_cs, errors);
|
|
str_charset=to_cs;
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Set a string to the value of a latin1-string, keeping the original charset
|
|
|
|
SYNOPSIS
|
|
copy_or_set()
|
|
str String of a simple charset (latin1)
|
|
arg_length Length of string
|
|
|
|
IMPLEMENTATION
|
|
If string object is of a simple character set, set it to point to the
|
|
given string.
|
|
If not, make a copy and convert it to the new character set.
|
|
|
|
RETURN
|
|
0 ok
|
|
1 Could not allocate result buffer
|
|
|
|
*/
|
|
|
|
bool String::set_ascii(const char *str, uint32 arg_length)
|
|
{
|
|
if (str_charset->mbminlen == 1)
|
|
{
|
|
set(str, arg_length, str_charset);
|
|
return 0;
|
|
}
|
|
uint dummy_errors;
|
|
return copy(str, arg_length, &my_charset_latin1, str_charset, &dummy_errors);
|
|
}
|
|
|
|
|
|
/* This is used by mysql.cc */
|
|
|
|
bool String::fill(uint32 max_length,char fill_char)
|
|
{
|
|
if (str_length > max_length)
|
|
Ptr[str_length=max_length]=0;
|
|
else
|
|
{
|
|
if (realloc(max_length))
|
|
return TRUE;
|
|
bfill(Ptr+str_length,max_length-str_length,fill_char);
|
|
str_length=max_length;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
void String::strip_sp()
|
|
{
|
|
while (str_length && my_isspace(str_charset,Ptr[str_length-1]))
|
|
str_length--;
|
|
}
|
|
|
|
bool String::append(const String &s)
|
|
{
|
|
if (s.length())
|
|
{
|
|
if (realloc(str_length+s.length()))
|
|
return TRUE;
|
|
memcpy(Ptr+str_length,s.ptr(),s.length());
|
|
str_length+=s.length();
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Append an ASCII string to the a string of the current character set
|
|
*/
|
|
|
|
bool String::append(const char *s,uint32 arg_length)
|
|
{
|
|
if (!arg_length)
|
|
return FALSE;
|
|
|
|
/*
|
|
For an ASCII incompatible string, e.g. UCS-2, we need to convert
|
|
*/
|
|
if (str_charset->mbminlen > 1)
|
|
{
|
|
uint32 add_length=arg_length * str_charset->mbmaxlen;
|
|
uint dummy_errors;
|
|
if (realloc(str_length+ add_length))
|
|
return TRUE;
|
|
str_length+= copy_and_convert(Ptr+str_length, add_length, str_charset,
|
|
s, arg_length, &my_charset_latin1,
|
|
&dummy_errors);
|
|
return FALSE;
|
|
}
|
|
|
|
/*
|
|
For an ASCII compatinble string we can just append.
|
|
*/
|
|
if (realloc(str_length+arg_length))
|
|
return TRUE;
|
|
memcpy(Ptr+str_length,s,arg_length);
|
|
str_length+=arg_length;
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Append a 0-terminated ASCII string
|
|
*/
|
|
|
|
bool String::append(const char *s)
|
|
{
|
|
return append(s, strlen(s));
|
|
}
|
|
|
|
|
|
/*
|
|
Append a string in the given charset to the string
|
|
with character set recoding
|
|
*/
|
|
|
|
bool String::append(const char *s,uint32 arg_length, CHARSET_INFO *cs)
|
|
{
|
|
uint32 dummy_offset;
|
|
|
|
if (needs_conversion(arg_length, cs, str_charset, &dummy_offset))
|
|
{
|
|
uint32 add_length= arg_length / cs->mbminlen * str_charset->mbmaxlen;
|
|
uint dummy_errors;
|
|
if (realloc(str_length + add_length))
|
|
return TRUE;
|
|
str_length+= copy_and_convert(Ptr+str_length, add_length, str_charset,
|
|
s, arg_length, cs, &dummy_errors);
|
|
}
|
|
else
|
|
{
|
|
if (realloc(str_length + arg_length))
|
|
return TRUE;
|
|
memcpy(Ptr + str_length, s, arg_length);
|
|
str_length+= arg_length;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
#ifdef TO_BE_REMOVED
|
|
bool String::append(FILE* file, uint32 arg_length, myf my_flags)
|
|
{
|
|
if (realloc(str_length+arg_length))
|
|
return TRUE;
|
|
if (my_fread(file, (uchar*) Ptr + str_length, arg_length, my_flags))
|
|
{
|
|
shrink(str_length);
|
|
return TRUE;
|
|
}
|
|
str_length+=arg_length;
|
|
return FALSE;
|
|
}
|
|
#endif
|
|
|
|
bool String::append(IO_CACHE* file, uint32 arg_length)
|
|
{
|
|
if (realloc(str_length+arg_length))
|
|
return TRUE;
|
|
if (my_b_read(file, (uchar*) Ptr + str_length, arg_length))
|
|
{
|
|
shrink(str_length);
|
|
return TRUE;
|
|
}
|
|
str_length+=arg_length;
|
|
return FALSE;
|
|
}
|
|
|
|
bool String::append_with_prefill(const char *s,uint32 arg_length,
|
|
uint32 full_length, char fill_char)
|
|
{
|
|
int t_length= arg_length > full_length ? arg_length : full_length;
|
|
|
|
if (realloc(str_length + t_length))
|
|
return TRUE;
|
|
t_length= full_length - arg_length;
|
|
if (t_length > 0)
|
|
{
|
|
bfill(Ptr+str_length, t_length, fill_char);
|
|
str_length=str_length + t_length;
|
|
}
|
|
append(s, arg_length);
|
|
return FALSE;
|
|
}
|
|
|
|
uint32 String::numchars()
|
|
{
|
|
return str_charset->cset->numchars(str_charset, Ptr, Ptr+str_length);
|
|
}
|
|
|
|
int String::charpos(int i,uint32 offset)
|
|
{
|
|
if (i <= 0)
|
|
return i;
|
|
return str_charset->cset->charpos(str_charset,Ptr+offset,Ptr+str_length,i);
|
|
}
|
|
|
|
int String::strstr(const String &s,uint32 offset)
|
|
{
|
|
if (s.length()+offset <= str_length)
|
|
{
|
|
if (!s.length())
|
|
return ((int) offset); // Empty string is always found
|
|
|
|
register const char *str = Ptr+offset;
|
|
register const char *search=s.ptr();
|
|
const char *end=Ptr+str_length-s.length()+1;
|
|
const char *search_end=s.ptr()+s.length();
|
|
skip:
|
|
while (str != end)
|
|
{
|
|
if (*str++ == *search)
|
|
{
|
|
register char *i,*j;
|
|
i=(char*) str; j=(char*) search+1;
|
|
while (j != search_end)
|
|
if (*i++ != *j++) goto skip;
|
|
return (int) (str-Ptr) -1;
|
|
}
|
|
}
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
** Search string from end. Offset is offset to the end of string
|
|
*/
|
|
|
|
int String::strrstr(const String &s,uint32 offset)
|
|
{
|
|
if (s.length() <= offset && offset <= str_length)
|
|
{
|
|
if (!s.length())
|
|
return offset; // Empty string is always found
|
|
register const char *str = Ptr+offset-1;
|
|
register const char *search=s.ptr()+s.length()-1;
|
|
|
|
const char *end=Ptr+s.length()-2;
|
|
const char *search_end=s.ptr()-1;
|
|
skip:
|
|
while (str != end)
|
|
{
|
|
if (*str-- == *search)
|
|
{
|
|
register char *i,*j;
|
|
i=(char*) str; j=(char*) search-1;
|
|
while (j != search_end)
|
|
if (*i-- != *j--) goto skip;
|
|
return (int) (i-Ptr) +1;
|
|
}
|
|
}
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
Replace substring with string
|
|
If wrong parameter or not enough memory, do nothing
|
|
*/
|
|
|
|
bool String::replace(uint32 offset,uint32 arg_length,const String &to)
|
|
{
|
|
return replace(offset,arg_length,to.ptr(),to.length());
|
|
}
|
|
|
|
bool String::replace(uint32 offset,uint32 arg_length,
|
|
const char *to, uint32 to_length)
|
|
{
|
|
long diff = (long) to_length-(long) arg_length;
|
|
if (offset+arg_length <= str_length)
|
|
{
|
|
if (diff < 0)
|
|
{
|
|
if (to_length)
|
|
memcpy(Ptr+offset,to,to_length);
|
|
bmove(Ptr+offset+to_length,Ptr+offset+arg_length,
|
|
str_length-offset-arg_length);
|
|
}
|
|
else
|
|
{
|
|
if (diff)
|
|
{
|
|
if (realloc(str_length+(uint32) diff))
|
|
return TRUE;
|
|
bmove_upp((uchar*) Ptr+str_length+diff, (uchar*) Ptr+str_length,
|
|
str_length-offset-arg_length);
|
|
}
|
|
if (to_length)
|
|
memcpy(Ptr+offset,to,to_length);
|
|
}
|
|
str_length+=(uint32) diff;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
// added by Holyfoot for "geometry" needs
|
|
int String::reserve(uint32 space_needed, uint32 grow_by)
|
|
{
|
|
if (Alloced_length < str_length + space_needed)
|
|
{
|
|
if (realloc(Alloced_length + max(space_needed, grow_by) - 1))
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
void String::qs_append(const char *str, uint32 len)
|
|
{
|
|
memcpy(Ptr + str_length, str, len + 1);
|
|
str_length += len;
|
|
}
|
|
|
|
void String::qs_append(double d)
|
|
{
|
|
char *buff = Ptr + str_length;
|
|
str_length+= my_sprintf(buff, (buff, "%.14g", d));
|
|
}
|
|
|
|
void String::qs_append(double *d)
|
|
{
|
|
double ld;
|
|
float8get(ld, (char*) d);
|
|
qs_append(ld);
|
|
}
|
|
|
|
void String::qs_append(int i)
|
|
{
|
|
char *buff= Ptr + str_length;
|
|
char *end= int10_to_str(i, buff, -10);
|
|
str_length+= (int) (end-buff);
|
|
}
|
|
|
|
void String::qs_append(uint i)
|
|
{
|
|
char *buff= Ptr + str_length;
|
|
char *end= int10_to_str(i, buff, 10);
|
|
str_length+= (int) (end-buff);
|
|
}
|
|
|
|
/*
|
|
Compare strings according to collation, without end space.
|
|
|
|
SYNOPSIS
|
|
sortcmp()
|
|
s First string
|
|
t Second string
|
|
cs Collation
|
|
|
|
NOTE:
|
|
Normally this is case sensitive comparison
|
|
|
|
RETURN
|
|
< 0 s < t
|
|
0 s == t
|
|
> 0 s > t
|
|
*/
|
|
|
|
|
|
int sortcmp(const String *s,const String *t, CHARSET_INFO *cs)
|
|
{
|
|
return cs->coll->strnncollsp(cs,
|
|
(unsigned char *) s->ptr(),s->length(),
|
|
(unsigned char *) t->ptr(),t->length(), 0);
|
|
}
|
|
|
|
|
|
/*
|
|
Compare strings byte by byte. End spaces are also compared.
|
|
|
|
SYNOPSIS
|
|
stringcmp()
|
|
s First string
|
|
t Second string
|
|
|
|
NOTE:
|
|
Strings are compared as a stream of unsigned chars
|
|
|
|
RETURN
|
|
< 0 s < t
|
|
0 s == t
|
|
> 0 s > t
|
|
*/
|
|
|
|
|
|
int stringcmp(const String *s,const String *t)
|
|
{
|
|
uint32 s_len=s->length(),t_len=t->length(),len=min(s_len,t_len);
|
|
int cmp= memcmp(s->ptr(), t->ptr(), len);
|
|
return (cmp) ? cmp : (int) (s_len - t_len);
|
|
}
|
|
|
|
|
|
String *copy_if_not_alloced(String *to,String *from,uint32 from_length)
|
|
{
|
|
if (from->Alloced_length >= from_length)
|
|
return from;
|
|
if (from->alloced || !to || from == to)
|
|
{
|
|
(void) from->realloc(from_length);
|
|
return from;
|
|
}
|
|
if (to->realloc(from_length))
|
|
return from; // Actually an error
|
|
if ((to->str_length=min(from->str_length,from_length)))
|
|
memcpy(to->Ptr,from->Ptr,to->str_length);
|
|
to->str_charset=from->str_charset;
|
|
return to;
|
|
}
|
|
|
|
|
|
/****************************************************************************
|
|
Help functions
|
|
****************************************************************************/
|
|
|
|
/*
|
|
copy a string from one character set to another
|
|
|
|
SYNOPSIS
|
|
copy_and_convert()
|
|
to Store result here
|
|
to_cs Character set of result string
|
|
from Copy from here
|
|
from_length Length of from string
|
|
from_cs From character set
|
|
|
|
NOTES
|
|
'to' must be big enough as form_length * to_cs->mbmaxlen
|
|
|
|
RETURN
|
|
length of bytes copied to 'to'
|
|
*/
|
|
|
|
|
|
uint32
|
|
copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs,
|
|
const char *from, uint32 from_length, CHARSET_INFO *from_cs,
|
|
uint *errors)
|
|
{
|
|
int cnvres;
|
|
my_wc_t wc;
|
|
const uchar *from_end= (const uchar*) from+from_length;
|
|
char *to_start= to;
|
|
uchar *to_end= (uchar*) to+to_length;
|
|
my_charset_conv_mb_wc mb_wc= from_cs->cset->mb_wc;
|
|
my_charset_conv_wc_mb wc_mb= to_cs->cset->wc_mb;
|
|
uint error_count= 0;
|
|
|
|
while (1)
|
|
{
|
|
if ((cnvres= (*mb_wc)(from_cs, &wc, (uchar*) from,
|
|
from_end)) > 0)
|
|
from+= cnvres;
|
|
else if (cnvres == MY_CS_ILSEQ)
|
|
{
|
|
error_count++;
|
|
from++;
|
|
wc= '?';
|
|
}
|
|
else if (cnvres > MY_CS_TOOSMALL)
|
|
{
|
|
/*
|
|
A correct multibyte sequence detected
|
|
But it doesn't have Unicode mapping.
|
|
*/
|
|
error_count++;
|
|
from+= (-cnvres);
|
|
wc= '?';
|
|
}
|
|
else
|
|
break; // Not enough characters
|
|
|
|
outp:
|
|
if ((cnvres= (*wc_mb)(to_cs, wc, (uchar*) to, to_end)) > 0)
|
|
to+= cnvres;
|
|
else if (cnvres == MY_CS_ILUNI && wc != '?')
|
|
{
|
|
error_count++;
|
|
wc= '?';
|
|
goto outp;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
*errors= error_count;
|
|
return (uint32) (to - to_start);
|
|
}
|
|
|
|
|
|
void String::print(String *str)
|
|
{
|
|
char *st= (char*)Ptr, *end= st+str_length;
|
|
for (; st < end; st++)
|
|
{
|
|
uchar c= *st;
|
|
switch (c)
|
|
{
|
|
case '\\':
|
|
str->append(STRING_WITH_LEN("\\\\"));
|
|
break;
|
|
case '\0':
|
|
str->append(STRING_WITH_LEN("\\0"));
|
|
break;
|
|
case '\'':
|
|
str->append(STRING_WITH_LEN("\\'"));
|
|
break;
|
|
case '\n':
|
|
str->append(STRING_WITH_LEN("\\n"));
|
|
break;
|
|
case '\r':
|
|
str->append(STRING_WITH_LEN("\\r"));
|
|
break;
|
|
case 26: //Ctrl-Z
|
|
str->append(STRING_WITH_LEN("\\z"));
|
|
break;
|
|
default:
|
|
str->append(c);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Exchange state of this object and argument.
|
|
|
|
SYNOPSIS
|
|
String::swap()
|
|
|
|
RETURN
|
|
Target string will contain state of this object and vice versa.
|
|
*/
|
|
|
|
void String::swap(String &s)
|
|
{
|
|
swap_variables(char *, Ptr, s.Ptr);
|
|
swap_variables(uint32, str_length, s.str_length);
|
|
swap_variables(uint32, Alloced_length, s.Alloced_length);
|
|
swap_variables(bool, alloced, s.alloced);
|
|
swap_variables(CHARSET_INFO*, str_charset, s.str_charset);
|
|
}
|