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
418 lines
10 KiB
C++
418 lines
10 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 */
|
|
|
|
/**
|
|
@file
|
|
|
|
It is interface module to fixed precision decimals library.
|
|
|
|
Most functions use 'uint mask' as parameter, if during operation error
|
|
which fit in this mask is detected then it will be processed automatically
|
|
here. (errors are E_DEC_* constants, see include/decimal.h)
|
|
|
|
Most function are just inline wrappers around library calls
|
|
*/
|
|
|
|
#ifndef my_decimal_h
|
|
#define my_decimal_h
|
|
|
|
C_MODE_START
|
|
#include <decimal.h>
|
|
C_MODE_END
|
|
|
|
#include <my_decimal_limits.h>
|
|
|
|
/**
|
|
maximum size of packet length.
|
|
*/
|
|
#define DECIMAL_MAX_FIELD_SIZE DECIMAL_MAX_PRECISION
|
|
|
|
|
|
inline uint my_decimal_size(uint precision, uint scale)
|
|
{
|
|
/*
|
|
Always allocate more space to allow library to put decimal point
|
|
where it want
|
|
*/
|
|
return decimal_size(precision, scale) + 1;
|
|
}
|
|
|
|
|
|
inline int my_decimal_int_part(uint precision, uint decimals)
|
|
{
|
|
return precision - ((decimals == DECIMAL_NOT_SPECIFIED) ? 0 : decimals);
|
|
}
|
|
|
|
|
|
/**
|
|
my_decimal class limits 'decimal_t' type to what we need in MySQL.
|
|
|
|
It contains internally all necessary space needed by the instance so
|
|
no extra memory is needed. One should call fix_buffer_pointer() function
|
|
when he moves my_decimal objects in memory.
|
|
*/
|
|
|
|
class my_decimal :public decimal_t
|
|
{
|
|
decimal_digit_t buffer[DECIMAL_BUFF_LENGTH];
|
|
|
|
public:
|
|
|
|
void init()
|
|
{
|
|
len= DECIMAL_BUFF_LENGTH;
|
|
buf= buffer;
|
|
#if !defined (HAVE_valgrind) && !defined(DBUG_OFF)
|
|
/* Set buffer to 'random' value to find wrong buffer usage */
|
|
for (uint i= 0; i < DECIMAL_BUFF_LENGTH; i++)
|
|
buffer[i]= i;
|
|
#endif
|
|
}
|
|
my_decimal()
|
|
{
|
|
init();
|
|
}
|
|
void fix_buffer_pointer() { buf= buffer; }
|
|
|
|
bool sign() const { return decimal_t::sign; }
|
|
void sign(bool s) { decimal_t::sign= s; }
|
|
uint precision() const { return intg + frac; }
|
|
|
|
/** Swap two my_decimal values */
|
|
void swap(my_decimal &rhs)
|
|
{
|
|
swap_variables(my_decimal, *this, rhs);
|
|
/* Swap the buffer pointers back */
|
|
swap_variables(decimal_digit_t *, buf, rhs.buf);
|
|
}
|
|
};
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
void print_decimal(const my_decimal *dec);
|
|
void print_decimal_buff(const my_decimal *dec, const uchar* ptr, int length);
|
|
const char *dbug_decimal_as_string(char *buff, const my_decimal *val);
|
|
#else
|
|
#define dbug_decimal_as_string(A) NULL
|
|
#endif
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
int decimal_operation_results(int result, const char *value, const char *type);
|
|
#else
|
|
inline int decimal_operation_results(int result, const char *value,
|
|
const char *type)
|
|
{
|
|
return result;
|
|
}
|
|
#endif /*MYSQL_CLIENT*/
|
|
|
|
inline
|
|
void max_my_decimal(my_decimal *to, int precision, int frac)
|
|
{
|
|
DBUG_ASSERT((precision <= DECIMAL_MAX_PRECISION)&&
|
|
(frac <= DECIMAL_MAX_SCALE));
|
|
max_decimal(precision, frac, (decimal_t*) to);
|
|
}
|
|
|
|
inline void max_internal_decimal(my_decimal *to)
|
|
{
|
|
max_my_decimal(to, DECIMAL_MAX_PRECISION, 0);
|
|
}
|
|
|
|
inline int check_result(uint mask, int result)
|
|
{
|
|
if (result & mask)
|
|
decimal_operation_results(result, "", "DECIMAL");
|
|
return result;
|
|
}
|
|
|
|
inline int check_result_and_overflow(uint mask, int result, my_decimal *val)
|
|
{
|
|
if (check_result(mask, result) & E_DEC_OVERFLOW)
|
|
{
|
|
bool sign= val->sign();
|
|
val->fix_buffer_pointer();
|
|
max_internal_decimal(val);
|
|
val->sign(sign);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
inline uint my_decimal_length_to_precision(uint length, uint scale,
|
|
bool unsigned_flag)
|
|
{
|
|
/* Precision can't be negative thus ignore unsigned_flag when length is 0. */
|
|
DBUG_ASSERT(length || !scale);
|
|
return (uint) (length - (scale>0 ? 1:0) -
|
|
(unsigned_flag || !length ? 0:1));
|
|
}
|
|
|
|
inline uint32 my_decimal_precision_to_length_no_truncation(uint precision,
|
|
uint8 scale,
|
|
bool unsigned_flag)
|
|
{
|
|
/*
|
|
When precision is 0 it means that original length was also 0. Thus
|
|
unsigned_flag is ignored in this case.
|
|
*/
|
|
DBUG_ASSERT(precision || !scale);
|
|
return (uint32)(precision + (scale > 0 ? 1 : 0) +
|
|
(unsigned_flag || !precision ? 0 : 1));
|
|
}
|
|
|
|
inline uint32 my_decimal_precision_to_length(uint precision, uint8 scale,
|
|
bool unsigned_flag)
|
|
{
|
|
/*
|
|
When precision is 0 it means that original length was also 0. Thus
|
|
unsigned_flag is ignored in this case.
|
|
*/
|
|
DBUG_ASSERT(precision || !scale);
|
|
set_if_smaller(precision, DECIMAL_MAX_PRECISION);
|
|
return my_decimal_precision_to_length_no_truncation(precision, scale,
|
|
unsigned_flag);
|
|
}
|
|
|
|
inline
|
|
int my_decimal_string_length(const my_decimal *d)
|
|
{
|
|
return decimal_string_size(d);
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_max_length(const my_decimal *d)
|
|
{
|
|
/* -1 because we do not count \0 */
|
|
return decimal_string_size(d) - 1;
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_get_binary_size(uint precision, uint scale)
|
|
{
|
|
return decimal_bin_size((int)precision, (int)scale);
|
|
}
|
|
|
|
|
|
inline
|
|
void my_decimal2decimal(const my_decimal *from, my_decimal *to)
|
|
{
|
|
*to= *from;
|
|
to->fix_buffer_pointer();
|
|
}
|
|
|
|
|
|
int my_decimal2binary(uint mask, const my_decimal *d, uchar *bin, int prec,
|
|
int scale);
|
|
|
|
|
|
inline
|
|
int binary2my_decimal(uint mask, const uchar *bin, my_decimal *d, int prec,
|
|
int scale)
|
|
{
|
|
return check_result(mask, bin2decimal(bin, (decimal_t*) d, prec, scale));
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_set_zero(my_decimal *d)
|
|
{
|
|
decimal_make_zero(((decimal_t*) d));
|
|
return 0;
|
|
}
|
|
|
|
|
|
inline
|
|
bool my_decimal_is_zero(const my_decimal *decimal_value)
|
|
{
|
|
return decimal_is_zero((decimal_t*) decimal_value);
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_round(uint mask, const my_decimal *from, int scale,
|
|
bool truncate, my_decimal *to)
|
|
{
|
|
return check_result(mask, decimal_round((decimal_t*) from, to, scale,
|
|
(truncate ? TRUNCATE : HALF_UP)));
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_floor(uint mask, const my_decimal *from, my_decimal *to)
|
|
{
|
|
return check_result(mask, decimal_round((decimal_t*) from, to, 0, FLOOR));
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_ceiling(uint mask, const my_decimal *from, my_decimal *to)
|
|
{
|
|
return check_result(mask, decimal_round((decimal_t*) from, to, 0, CEILING));
|
|
}
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
int my_decimal2string(uint mask, const my_decimal *d, uint fixed_prec,
|
|
uint fixed_dec, char filler, String *str);
|
|
#endif
|
|
|
|
int my_decimal2int(uint mask, const decimal_t *d, bool unsigned_flag,
|
|
longlong *l);
|
|
|
|
inline
|
|
int my_decimal2double(uint, const decimal_t *d, double *result)
|
|
{
|
|
/* No need to call check_result as this will always succeed */
|
|
return decimal2double(d, result);
|
|
}
|
|
|
|
|
|
inline
|
|
int str2my_decimal(uint mask, const char *str, my_decimal *d, char **end)
|
|
{
|
|
return check_result_and_overflow(mask, string2decimal(str,(decimal_t*)d,end),
|
|
d);
|
|
}
|
|
|
|
|
|
int str2my_decimal(uint mask, const char *from, uint length,
|
|
CHARSET_INFO *charset, my_decimal *decimal_value);
|
|
|
|
#if defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
|
|
inline
|
|
int string2my_decimal(uint mask, const String *str, my_decimal *d)
|
|
{
|
|
return str2my_decimal(mask, str->ptr(), str->length(), str->charset(), d);
|
|
}
|
|
|
|
|
|
my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec);
|
|
|
|
|
|
#endif /*defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY) */
|
|
|
|
inline
|
|
int double2my_decimal(uint mask, double val, my_decimal *d)
|
|
{
|
|
return check_result_and_overflow(mask, double2decimal(val, (decimal_t*)d), d);
|
|
}
|
|
|
|
|
|
inline
|
|
int int2my_decimal(uint mask, longlong i, my_bool unsigned_flag, my_decimal *d)
|
|
{
|
|
return check_result(mask, (unsigned_flag ?
|
|
ulonglong2decimal((ulonglong)i, d) :
|
|
longlong2decimal(i, d)));
|
|
}
|
|
|
|
inline
|
|
void decimal2my_decimal(decimal_t *from, my_decimal *to)
|
|
{
|
|
DBUG_ASSERT(to->len >= from->len);
|
|
to->intg= from->intg;
|
|
to->frac= from->frac;
|
|
to->sign(from->sign);
|
|
memcpy(to->buf, from->buf, to->len*sizeof(decimal_digit_t));
|
|
}
|
|
|
|
|
|
inline
|
|
void my_decimal_neg(decimal_t *arg)
|
|
{
|
|
if (decimal_is_zero(arg))
|
|
{
|
|
arg->sign= 0;
|
|
return;
|
|
}
|
|
decimal_neg(arg);
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_add(uint mask, my_decimal *res, const my_decimal *a,
|
|
const my_decimal *b)
|
|
{
|
|
return check_result_and_overflow(mask,
|
|
decimal_add((decimal_t*)a,(decimal_t*)b,res),
|
|
res);
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_sub(uint mask, my_decimal *res, const my_decimal *a,
|
|
const my_decimal *b)
|
|
{
|
|
return check_result_and_overflow(mask,
|
|
decimal_sub((decimal_t*)a,(decimal_t*)b,res),
|
|
res);
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_mul(uint mask, my_decimal *res, const my_decimal *a,
|
|
const my_decimal *b)
|
|
{
|
|
return check_result_and_overflow(mask,
|
|
decimal_mul((decimal_t*)a,(decimal_t*)b,res),
|
|
res);
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_div(uint mask, my_decimal *res, const my_decimal *a,
|
|
const my_decimal *b, int div_scale_inc)
|
|
{
|
|
return check_result_and_overflow(mask,
|
|
decimal_div((decimal_t*)a,(decimal_t*)b,res,
|
|
div_scale_inc),
|
|
res);
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_mod(uint mask, my_decimal *res, const my_decimal *a,
|
|
const my_decimal *b)
|
|
{
|
|
return check_result_and_overflow(mask,
|
|
decimal_mod((decimal_t*)a,(decimal_t*)b,res),
|
|
res);
|
|
}
|
|
|
|
/**
|
|
@return
|
|
-1 if a<b, 1 if a>b and 0 if a==b
|
|
*/
|
|
inline
|
|
int my_decimal_cmp(const my_decimal *a, const my_decimal *b)
|
|
{
|
|
return decimal_cmp((decimal_t*) a, (decimal_t*) b);
|
|
}
|
|
|
|
|
|
inline
|
|
int my_decimal_intg(const my_decimal *a)
|
|
{
|
|
return decimal_intg((decimal_t*) a);
|
|
}
|
|
|
|
|
|
void my_decimal_trim(ulong *precision, uint *scale);
|
|
|
|
|
|
#endif /*my_decimal_h*/
|
|
|