mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
5ab92b1f85
- COLUMN_CREATE(column_nr, value, [column_nr,value]...) - COLUMN_ADD(blob,column_nr, value, column_nr,value]...) - COLUMN_DELETE(blob, column_nr, column_nr...) - COLUMN_EXISTS(blob, column_nr) - COLUMN_LIST(blob, column_nr) - COLUMN_GET(string, column_nr AS type) Added cast(X as DOUBLE) and cast(x as INT) Better warning and error messages for wrong cast's Created some sub functions to simplify and reuse code. Added a lot of conversation functions with error/warnings for what went wrong. Fixed some issues when casting time to datetime. Added functions to dynamic strings and Strings to allow one to move a string buffer from dynamic strings to String (to save malloc+ copy) Added dynamic columns library to libmysqlclient include/Makefile.am: Added ma_dyncol.h include/decimal.h: Added 'const' to arguments for some functions. include/my_sys.h: Added dynstr_reassociate() include/my_time.h: Added TIME_SUBSECOND_RANGE Added double_to_datetime() Added flag argument to str_to_time() libmysql/CMakeLists.txt: Added mysys/ma_dyncol.c libmysql/Makefile.shared: Added ma_dyncol libmysql/libmysql.c: Added argument to str_to_time() mysql-test/r/bigint.result: Better error messages mysql-test/r/cast.result: Better warning and error messages A lot of new cast() tests mysql-test/r/func_math.result: Better warning messages mysql-test/r/func_str.result: Better warning messages mysql-test/r/func_time.result: Better warning messages mysql-test/r/sp-vars.result: Better warning messages mysql-test/r/strict.result: Better warning messages New test result mysql-test/r/type_newdecimal.result: Better warning messages mysql-test/r/warnings.result: Better warning messages mysql-test/suite/funcs_1/r/innodb_func_view.result: Updated results after better cast warnings mysql-test/suite/funcs_1/r/memory_func_view.result: Updated results after better cast warnings mysql-test/suite/funcs_1/r/myisam_func_view.result: Updated results after better cast warnings mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test: Added begin...commit to speed up test. mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc: Added begin...commit to speed up test. mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc: Added begin...commit to speed up test. mysql-test/suite/parts/r/part_supported_sql_func_innodb.result: Added begin...commit to speed up test. mysql-test/suite/parts/r/part_supported_sql_func_myisam.result: Added begin...commit to speed up test. mysql-test/suite/parts/r/rpl_partition.result: Added begin...commit to speed up test. mysql-test/suite/parts/t/part_supported_sql_func_innodb.test: Removed duplicated --big_test mysql-test/suite/parts/t/rpl_partition.test: Added begin...commit to speed up test. mysql-test/suite/pbxt/r/cast.result: Updated results after better cast warnings mysql-test/suite/pbxt/r/func_str.result: Updated results after better cast warnings mysql-test/suite/pbxt/r/type_newdecimal.result: Updated results after better cast warnings mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: Added begin...commit to speed up test. mysql-test/suite/rpl/t/rpl_innodb_bug28430.test: Added begin...commit to speed up test. mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result: More warnings mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result: More warnings mysql-test/t/cast.test: A lot of new cast() tests mysql-test/t/strict.test: Added new test mysys/CMakeLists.txt: Added ma_dyncol.c mysys/Makefile.am: Added ma_dyncol.c mysys/string.c: Added dynstr_reassociate() to move a buffer from dynamic_strings to some other allocator sql-common/my_time.c: Added 'fuzzydate' flag to str_to_time() Added support for microseconds to my_time_to_str() and my_datetime_to_str() Reset second_parts in number_to_datetime() Added double_to_datetime() sql/field.cc: Added double_to_longlong() and truncate_double() to simplify and reuse code sql/field.h: New prototypes sql/item.cc: Changed Item::get_date(MYSQL_TIME *ltime,uint fuzzydate) to be aware of type of argument. (Needed to make it microsecond safe and get better warnings). Updated call to str_to_time_with_warn() sql/item.h: Added struct st_dyncall_create_def used by dynamic columns Added virtual bool dynamic_result() to tell if type of argument may change over calls. sql/item_cmpfunc.cc: Added Item_func_dyncol_exists() sql/item_cmpfunc.h: Added class Item_func_dyncol_exists sql/item_create.cc: Added get_length_and_scale() to simplify other functions Simplified and extended create_func_cast() Added support for cast(X as double(X,Y)) Added functions to create dynamic column functions. sql/item_create.h: Added prototypes sql/item_func.cc: Extended cast functions Item_func_signed() and Item_func_unsigned() to work with dynamic types Added Item_double_typecast() sql/item_func.h: Added class Item_double_typecast() sql/item_strfunc.cc: Added functions for COLUMN_CREATE(), COLUMN_ADD(), COLUMN_GET() and COLUMN_LIST() sql/item_strfunc.h: Added classes for COLUMN_CREATE(), COLUMN_ADD(), COLUMN_GET() and COLUMN_LIST() sql/item_timefunc.cc: Added flag argument to str_to_time_with_warn() Updated Item_char_typecast() to handle result type that may change between calls (for dynamic columns) Added Item_time_typecast::get_date() to ensure that we cast a datetime to time properly. sql/item_timefunc.h: Added get_date() to Item_time_typecast() to allow proper results for casting time to datetime sql/lex.h: Added new SQL function names sql/my_decimal.cc: Added 'const' to some arguments. Better error message in case of errors (we now print out the wrong value) Added my_decimal2int() sql/my_decimal.h: Moved some constants to my_decimal_limits.h Updated prototypes. Made my_decimal2int() a function as it's rather long (no reason to have it inline) Added decimal2my_decimal() function. sql/mysql_priv.h: Prototypes for new functions sql/share/errmsg.txt: New error messages for wrong casts and dynamic columns sql/sql_acl.cc: Fixed indentation sql/sql_base.cc: Added dynamic_column_error_message() sql/sql_string.h: Added reassociate() to move a buffer to be owned by String object. sql/sql_yacc.yy: Added syntax for COLUMN_ functions. sql/time.cc: Updated str_to_datetime_with_warn() flag argument to same type as other functions Added conversion flag to str_to_time_with_warn() (Similar to all datetime functions) Added conversion functions with warnings: double_to_datetime_with_warn() and decimal_to_datetime_with_warn() strings/decimal.c: Added 'const' to arguments for some functions. unittest/mysys/Makefile.am: Added test for dynamic columns code
197 lines
5.4 KiB
C
197 lines
5.4 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 */
|
|
|
|
/*
|
|
Code for handling strings with can grow dynamicly.
|
|
Copyright Monty Program KB.
|
|
By monty.
|
|
*/
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
|
|
my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str,
|
|
size_t init_alloc, size_t alloc_increment)
|
|
{
|
|
size_t length;
|
|
DBUG_ENTER("init_dynamic_string");
|
|
|
|
if (!alloc_increment)
|
|
alloc_increment=128;
|
|
length=1;
|
|
if (init_str && (length= strlen(init_str)+1) < init_alloc)
|
|
init_alloc=((length+alloc_increment-1)/alloc_increment)*alloc_increment;
|
|
if (!init_alloc)
|
|
init_alloc=alloc_increment;
|
|
|
|
if (!(str->str=(char*) my_malloc(init_alloc,MYF(MY_WME))))
|
|
DBUG_RETURN(TRUE);
|
|
str->length=length-1;
|
|
if (init_str)
|
|
memcpy(str->str,init_str,length);
|
|
str->max_length=init_alloc;
|
|
str->alloc_increment=alloc_increment;
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str)
|
|
{
|
|
uint length=0;
|
|
DBUG_ENTER("dynstr_set");
|
|
|
|
if (init_str && (length= (uint) strlen(init_str)+1) > str->max_length)
|
|
{
|
|
str->max_length=((length+str->alloc_increment-1)/str->alloc_increment)*
|
|
str->alloc_increment;
|
|
if (!str->max_length)
|
|
str->max_length=str->alloc_increment;
|
|
if (!(str->str=(char*) my_realloc(str->str,str->max_length,MYF(MY_WME))))
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
if (init_str)
|
|
{
|
|
str->length=length-1;
|
|
memcpy(str->str,init_str,length);
|
|
}
|
|
else
|
|
str->length=0;
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
my_bool dynstr_realloc(DYNAMIC_STRING *str, size_t additional_size)
|
|
{
|
|
DBUG_ENTER("dynstr_realloc");
|
|
|
|
if (!additional_size) DBUG_RETURN(FALSE);
|
|
if (str->length + additional_size > str->max_length)
|
|
{
|
|
str->max_length=((str->length + additional_size+str->alloc_increment-1)/
|
|
str->alloc_increment)*str->alloc_increment;
|
|
if (!(str->str=(char*) my_realloc(str->str,str->max_length,MYF(MY_WME))))
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
my_bool dynstr_append(DYNAMIC_STRING *str, const char *append)
|
|
{
|
|
return dynstr_append_mem(str,append,(uint) strlen(append));
|
|
}
|
|
|
|
|
|
my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append,
|
|
size_t length)
|
|
{
|
|
char *new_ptr;
|
|
if (str->length+length >= str->max_length)
|
|
{
|
|
size_t new_length=(str->length+length+str->alloc_increment)/
|
|
str->alloc_increment;
|
|
new_length*=str->alloc_increment;
|
|
if (!(new_ptr=(char*) my_realloc(str->str,new_length,MYF(MY_WME))))
|
|
return TRUE;
|
|
str->str=new_ptr;
|
|
str->max_length=new_length;
|
|
}
|
|
memcpy(str->str + str->length,append,length);
|
|
str->length+=length;
|
|
str->str[str->length]=0; /* Safety for C programs */
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
my_bool dynstr_trunc(DYNAMIC_STRING *str, size_t n)
|
|
{
|
|
str->length-=n;
|
|
str->str[str->length]= '\0';
|
|
return FALSE;
|
|
}
|
|
|
|
/*
|
|
Concatenates any number of strings, escapes any OS quote in the result then
|
|
surround the whole affair in another set of quotes which is finally appended
|
|
to specified DYNAMIC_STRING. This function is especially useful when
|
|
building strings to be executed with the system() function.
|
|
|
|
@param str Dynamic String which will have addtional strings appended.
|
|
@param append String to be appended.
|
|
@param ... Optional. Additional string(s) to be appended.
|
|
|
|
@note The final argument in the list must be NullS even if no additional
|
|
options are passed.
|
|
|
|
@return True = Success.
|
|
*/
|
|
|
|
my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append, ...)
|
|
{
|
|
#ifdef __WIN__
|
|
const char *quote_str= "\"";
|
|
const uint quote_len= 1;
|
|
#else
|
|
const char *quote_str= "\'";
|
|
const uint quote_len= 1;
|
|
#endif /* __WIN__ */
|
|
my_bool ret= TRUE;
|
|
va_list dirty_text;
|
|
|
|
ret&= dynstr_append_mem(str, quote_str, quote_len); /* Leading quote */
|
|
va_start(dirty_text, append);
|
|
while (append != NullS)
|
|
{
|
|
const char *cur_pos= append;
|
|
const char *next_pos= cur_pos;
|
|
|
|
/* Search for quote in each string and replace with escaped quote */
|
|
while(*(next_pos= strcend(cur_pos, quote_str[0])) != '\0')
|
|
{
|
|
ret&= dynstr_append_mem(str, cur_pos, (uint) (next_pos - cur_pos));
|
|
ret&= dynstr_append_mem(str ,"\\", 1);
|
|
ret&= dynstr_append_mem(str, quote_str, quote_len);
|
|
cur_pos= next_pos + 1;
|
|
}
|
|
ret&= dynstr_append_mem(str, cur_pos, (uint) (next_pos - cur_pos));
|
|
append= va_arg(dirty_text, char *);
|
|
}
|
|
va_end(dirty_text);
|
|
ret&= dynstr_append_mem(str, quote_str, quote_len); /* Trailing quote */
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
void dynstr_free(DYNAMIC_STRING *str)
|
|
{
|
|
if (str->str)
|
|
{
|
|
my_free(str->str,MYF(MY_WME));
|
|
str->str=0;
|
|
}
|
|
}
|
|
|
|
|
|
/* Give over the control of the dynamic string to caller */
|
|
|
|
void dynstr_reassociate(DYNAMIC_STRING *str, char **ptr, size_t *length,
|
|
size_t *alloc_length)
|
|
{
|
|
*ptr= str->str;
|
|
*length= str->length;
|
|
*alloc_length= str->max_length;
|
|
str->str=0;
|
|
}
|