mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
107 lines
4 KiB
C
107 lines
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 */
|
|
|
|
#ifndef _decimal_h
|
|
#define _decimal_h
|
|
|
|
typedef enum
|
|
{TRUNCATE=0, HALF_EVEN, HALF_UP, CEILING, FLOOR}
|
|
decimal_round_mode;
|
|
typedef int32 decimal_digit_t;
|
|
|
|
typedef struct st_decimal_t {
|
|
int intg, frac, len;
|
|
my_bool sign;
|
|
decimal_digit_t *buf;
|
|
} decimal_t;
|
|
|
|
int internal_str2dec(const char *from, decimal_t *to, char **end,
|
|
my_bool fixed);
|
|
int decimal2string(const decimal_t *from, char *to, int *to_len,
|
|
int fixed_precision, int fixed_decimals,
|
|
char filler);
|
|
int decimal2ulonglong(const decimal_t *from, ulonglong *to);
|
|
int ulonglong2decimal(ulonglong from, decimal_t *to);
|
|
int decimal2longlong(const decimal_t *from, longlong *to);
|
|
int longlong2decimal(longlong from, decimal_t *to);
|
|
int decimal2double(const decimal_t *from, double *to);
|
|
int double2decimal(double from, decimal_t *to);
|
|
int decimal_actual_fraction(decimal_t *from);
|
|
int decimal2bin(const decimal_t *from, uchar *to, int precision, int scale);
|
|
int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale);
|
|
|
|
int decimal_size(int precision, int scale);
|
|
int decimal_bin_size(int precision, int scale);
|
|
int decimal_result_size(decimal_t *from1, decimal_t *from2, char op,
|
|
int param);
|
|
|
|
int decimal_intg(decimal_t *from);
|
|
int decimal_add(decimal_t *from1, decimal_t *from2, decimal_t *to);
|
|
int decimal_sub(decimal_t *from1, decimal_t *from2, decimal_t *to);
|
|
int decimal_cmp(decimal_t *from1, decimal_t *from2);
|
|
int decimal_mul(decimal_t *from1, decimal_t *from2, decimal_t *to);
|
|
int decimal_div(decimal_t *from1, decimal_t *from2, decimal_t *to,
|
|
int scale_incr);
|
|
int decimal_mod(decimal_t *from1, decimal_t *from2, decimal_t *to);
|
|
int decimal_round(const decimal_t *from, decimal_t *to, int new_scale,
|
|
decimal_round_mode mode);
|
|
int decimal_is_zero(decimal_t *from);
|
|
void max_decimal(int precision, int frac, decimal_t *to);
|
|
|
|
#define string2decimal(A,B,C) internal_str2dec((A), (B), (C), 0)
|
|
#define string2decimal_fixed(A,B,C) internal_str2dec((A), (B), (C), 1)
|
|
|
|
/* set a decimal_t to zero */
|
|
|
|
#define decimal_make_zero(dec) do { \
|
|
(dec)->buf[0]=0; \
|
|
(dec)->intg=1; \
|
|
(dec)->frac=0; \
|
|
(dec)->sign=0; \
|
|
} while(0)
|
|
|
|
/*
|
|
returns the length of the buffer to hold string representation
|
|
of the decimal (including decimal dot, possible sign and \0)
|
|
*/
|
|
|
|
#define decimal_string_size(dec) (((dec)->intg ? (dec)->intg : 1) + \
|
|
(dec)->frac + ((dec)->frac > 0) + 2)
|
|
|
|
/* negate a decimal */
|
|
#define decimal_neg(dec) do { (dec)->sign^=1; } while(0)
|
|
|
|
/*
|
|
conventions:
|
|
|
|
decimal_smth() == 0 -- everything's ok
|
|
decimal_smth() <= 1 -- result is usable, but precision loss is possible
|
|
decimal_smth() <= 2 -- result can be unusable, most significant digits
|
|
could've been lost
|
|
decimal_smth() > 2 -- no result was generated
|
|
*/
|
|
|
|
#define E_DEC_OK 0
|
|
#define E_DEC_TRUNCATED 1
|
|
#define E_DEC_OVERFLOW 2
|
|
#define E_DEC_DIV_ZERO 4
|
|
#define E_DEC_BAD_NUM 8
|
|
#define E_DEC_OOM 16
|
|
|
|
#define E_DEC_ERROR 31
|
|
#define E_DEC_FATAL_ERROR 30
|
|
|
|
#endif
|
|
|