mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +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
314 lines
8.5 KiB
C++
314 lines
8.5 KiB
C++
/* Copyright (C) 2005-2006 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 */
|
|
|
|
#include "mysql_priv.h"
|
|
#include <time.h>
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
/**
|
|
report result of decimal operation.
|
|
|
|
@param result decimal library return code (E_DEC_* see include/decimal.h)
|
|
|
|
@todo
|
|
Fix error messages
|
|
|
|
@return
|
|
result
|
|
*/
|
|
|
|
int decimal_operation_results(int result, const char *value, const char *type)
|
|
{
|
|
switch (result) {
|
|
case E_DEC_OK:
|
|
break;
|
|
case E_DEC_TRUNCATED:
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
ER_DATA_TRUNCATED, ER(ER_DATA_TRUNCATED),
|
|
value, type);
|
|
break;
|
|
case E_DEC_OVERFLOW:
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
|
|
ER_DATA_OVERFLOW, ER(ER_DATA_OVERFLOW),
|
|
value, type);
|
|
break;
|
|
case E_DEC_DIV_ZERO:
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
|
|
ER_DIVISION_BY_ZERO, ER(ER_DIVISION_BY_ZERO));
|
|
break;
|
|
case E_DEC_BAD_NUM:
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
|
|
ER_BAD_DATA, ER(ER_BAD_DATA),
|
|
value, type);
|
|
break;
|
|
case E_DEC_OOM:
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
|
break;
|
|
default:
|
|
DBUG_ASSERT(0);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
|
|
/**
|
|
@brief Converting decimal to string
|
|
|
|
@details Convert given my_decimal to String; allocate buffer as needed.
|
|
|
|
@param[in] mask what problems to warn on (mask of E_DEC_* values)
|
|
@param[in] d the decimal to print
|
|
@param[in] fixed_prec overall number of digits if ZEROFILL, 0 otherwise
|
|
@param[in] fixed_dec number of decimal places (if fixed_prec != 0)
|
|
@param[in] filler what char to pad with (ZEROFILL et al.)
|
|
@param[out] *str where to store the resulting string
|
|
|
|
@return error coce
|
|
@retval E_DEC_OK
|
|
@retval E_DEC_TRUNCATED
|
|
@retval E_DEC_OVERFLOW
|
|
@retval E_DEC_OOM
|
|
*/
|
|
|
|
int my_decimal2string(uint mask, const my_decimal *d,
|
|
uint fixed_prec, uint fixed_dec,
|
|
char filler, String *str)
|
|
{
|
|
/*
|
|
Calculate the size of the string: For DECIMAL(a,b), fixed_prec==a
|
|
holds true iff the type is also ZEROFILL, which in turn implies
|
|
UNSIGNED. Hence the buffer for a ZEROFILLed value is the length
|
|
the user requested, plus one for a possible decimal point, plus
|
|
one if the user only wanted decimal places, but we force a leading
|
|
zero on them. Because the type is implicitly UNSIGNED, we do not
|
|
need to reserve a character for the sign. For all other cases,
|
|
fixed_prec will be 0, and my_decimal_string_length() will be called
|
|
instead to calculate the required size of the buffer.
|
|
*/
|
|
int length= (fixed_prec
|
|
? (fixed_prec + ((fixed_prec == fixed_dec) ? 1 : 0) + 1)
|
|
: my_decimal_string_length(d));
|
|
int result;
|
|
if (str->alloc(length))
|
|
return check_result(mask, E_DEC_OOM);
|
|
result= decimal2string((decimal_t*) d, (char*) str->ptr(),
|
|
&length, (int)fixed_prec, fixed_dec,
|
|
filler);
|
|
str->set_charset(&my_charset_bin);
|
|
str->length(length);
|
|
return check_result(mask, result);
|
|
}
|
|
|
|
|
|
/*
|
|
Convert from decimal to binary representation
|
|
|
|
SYNOPSIS
|
|
my_decimal2binary()
|
|
mask error processing mask
|
|
d number for conversion
|
|
bin pointer to buffer where to write result
|
|
prec overall number of decimal digits
|
|
scale number of decimal digits after decimal point
|
|
|
|
NOTE
|
|
Before conversion we round number if it need but produce truncation
|
|
error in this case
|
|
|
|
RETURN
|
|
E_DEC_OK
|
|
E_DEC_TRUNCATED
|
|
E_DEC_OVERFLOW
|
|
*/
|
|
|
|
int my_decimal2binary(uint mask, const my_decimal *d, uchar *bin, int prec,
|
|
int scale)
|
|
{
|
|
int err1= E_DEC_OK, err2;
|
|
my_decimal rounded;
|
|
my_decimal2decimal(d, &rounded);
|
|
rounded.frac= decimal_actual_fraction(&rounded);
|
|
if (scale < rounded.frac)
|
|
{
|
|
err1= E_DEC_TRUNCATED;
|
|
/* decimal_round can return only E_DEC_TRUNCATED */
|
|
decimal_round(&rounded, &rounded, scale, HALF_UP);
|
|
}
|
|
err2= decimal2bin(&rounded, bin, prec, scale);
|
|
if (!err2)
|
|
err2= err1;
|
|
return check_result(mask, err2);
|
|
}
|
|
|
|
|
|
/*
|
|
Convert string for decimal when string can be in some multibyte charset
|
|
|
|
SYNOPSIS
|
|
str2my_decimal()
|
|
mask error processing mask
|
|
from string to process
|
|
length length of given string
|
|
charset charset of given string
|
|
decimal_value buffer for result storing
|
|
|
|
RESULT
|
|
E_DEC_OK
|
|
E_DEC_TRUNCATED
|
|
E_DEC_OVERFLOW
|
|
E_DEC_BAD_NUM
|
|
E_DEC_OOM
|
|
*/
|
|
|
|
int str2my_decimal(uint mask, const char *from, uint length,
|
|
CHARSET_INFO *charset, my_decimal *decimal_value)
|
|
{
|
|
char *end, *from_end;
|
|
int err;
|
|
char buff[STRING_BUFFER_USUAL_SIZE];
|
|
String tmp(buff, sizeof(buff), &my_charset_bin);
|
|
if (charset->mbminlen > 1)
|
|
{
|
|
uint dummy_errors;
|
|
tmp.copy(from, length, charset, &my_charset_latin1, &dummy_errors);
|
|
from= tmp.ptr();
|
|
length= tmp.length();
|
|
charset= &my_charset_bin;
|
|
}
|
|
from_end= end= (char*) from+length;
|
|
err= string2decimal((char *)from, (decimal_t*) decimal_value, &end);
|
|
if (end != from_end && !err)
|
|
{
|
|
/* Give warning if there is something other than end space */
|
|
for ( ; end < from_end; end++)
|
|
{
|
|
if (!my_isspace(&my_charset_latin1, *end))
|
|
{
|
|
err= E_DEC_TRUNCATED;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
check_result_and_overflow(mask, err, decimal_value);
|
|
return err;
|
|
}
|
|
|
|
|
|
my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec)
|
|
{
|
|
longlong date;
|
|
date = (ltime->year*100L + ltime->month)*100L + ltime->day;
|
|
if (ltime->time_type > MYSQL_TIMESTAMP_DATE)
|
|
date= ((date*100L + ltime->hour)*100L+ ltime->minute)*100L + ltime->second;
|
|
if (int2my_decimal(E_DEC_FATAL_ERROR, ltime->neg ? -date : date, FALSE, dec))
|
|
return dec;
|
|
if (ltime->second_part)
|
|
{
|
|
dec->buf[(dec->intg-1) / 9 + 1]= ltime->second_part * 1000;
|
|
dec->frac= 6;
|
|
}
|
|
return dec;
|
|
}
|
|
|
|
|
|
void my_decimal_trim(ulong *precision, uint *scale)
|
|
{
|
|
if (!(*precision) && !(*scale))
|
|
{
|
|
*precision= 10;
|
|
*scale= 0;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Convert a decimal to an ulong with a descreptive error message
|
|
*/
|
|
|
|
int my_decimal2int(uint mask, const decimal_t *d, bool unsigned_flag,
|
|
longlong *l)
|
|
{
|
|
int res;
|
|
my_decimal rounded;
|
|
/* decimal_round can return only E_DEC_TRUNCATED */
|
|
decimal_round(d, &rounded, 0, HALF_UP);
|
|
res= (unsigned_flag ?
|
|
decimal2ulonglong(&rounded, (ulonglong *) l) :
|
|
decimal2longlong(&rounded, l));
|
|
if (res & mask)
|
|
{
|
|
char buff[DECIMAL_MAX_STR_LENGTH];
|
|
int length= sizeof(buff);
|
|
decimal2string(d, buff, &length, 0, 0, 0);
|
|
|
|
decimal_operation_results(res, buff,
|
|
unsigned_flag ? "UNSIGNED INT" :
|
|
"INT");
|
|
}
|
|
return res;
|
|
}
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
/* routines for debugging print */
|
|
|
|
#define DIG_PER_DEC1 9
|
|
#define ROUND_UP(X) (((X)+DIG_PER_DEC1-1)/DIG_PER_DEC1)
|
|
|
|
/* print decimal */
|
|
void
|
|
print_decimal(const my_decimal *dec)
|
|
{
|
|
int i, end;
|
|
char buff[512], *pos;
|
|
pos= buff;
|
|
pos+= my_sprintf(buff, (buff, "Decimal: sign: %d intg: %d frac: %d { ",
|
|
dec->sign(), dec->intg, dec->frac));
|
|
end= ROUND_UP(dec->frac)+ROUND_UP(dec->intg)-1;
|
|
for (i=0; i < end; i++)
|
|
pos+= my_sprintf(pos, (pos, "%09d, ", dec->buf[i]));
|
|
pos+= my_sprintf(pos, (pos, "%09d }\n", dec->buf[i]));
|
|
fputs(buff, DBUG_FILE);
|
|
}
|
|
|
|
|
|
/* print decimal with its binary representation */
|
|
void
|
|
print_decimal_buff(const my_decimal *dec, const uchar* ptr, int length)
|
|
{
|
|
print_decimal(dec);
|
|
fprintf(DBUG_FILE, "Record: ");
|
|
for (int i= 0; i < length; i++)
|
|
{
|
|
fprintf(DBUG_FILE, "%02X ", (uint)((uchar *)ptr)[i]);
|
|
}
|
|
fprintf(DBUG_FILE, "\n");
|
|
}
|
|
|
|
|
|
const char *dbug_decimal_as_string(char *buff, const my_decimal *val)
|
|
{
|
|
int length= DECIMAL_MAX_STR_LENGTH;
|
|
if (!val)
|
|
return "NULL";
|
|
(void)decimal2string((decimal_t*) val, buff, &length, 0,0,0);
|
|
return buff;
|
|
}
|
|
|
|
|
|
#endif /*DBUG_OFF*/
|
|
#endif /*MYSQL_CLIENT*/
|