mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +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
145 lines
4.7 KiB
Text
145 lines
4.7 KiB
Text
include/master-slave.inc
|
|
[connection master]
|
|
use test;
|
|
CREATE TABLE test.regular_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,
|
|
dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,
|
|
fkid MEDIUMINT, filler VARCHAR(255),
|
|
PRIMARY KEY(id)) ENGINE='innodb';
|
|
CREATE TABLE test.bykey_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,
|
|
dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,
|
|
fkid MEDIUMINT, filler VARCHAR(255),
|
|
PRIMARY KEY(id)) ENGINE='innodb'
|
|
PARTITION BY KEY(id) partitions 5;
|
|
CREATE TABLE test.byrange_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,
|
|
dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,
|
|
fkid MEDIUMINT, filler VARCHAR(255),
|
|
PRIMARY KEY(id)) ENGINE='innodb'
|
|
PARTITION BY RANGE(id)
|
|
SUBPARTITION BY hash(id) subpartitions 2
|
|
(PARTITION pa1 values less than (10),
|
|
PARTITION pa2 values less than (20),
|
|
PARTITION pa3 values less than (30),
|
|
PARTITION pa4 values less than (40),
|
|
PARTITION pa5 values less than (50),
|
|
PARTITION pa6 values less than (60),
|
|
PARTITION pa7 values less than (70),
|
|
PARTITION pa8 values less than (80),
|
|
PARTITION pa9 values less than (90),
|
|
PARTITION pa10 values less than (100),
|
|
PARTITION pa11 values less than MAXVALUE);
|
|
CREATE PROCEDURE test.proc_norm()
|
|
BEGIN
|
|
DECLARE ins_count INT DEFAULT 1000;
|
|
DECLARE del_count INT;
|
|
DECLARE cur_user VARCHAR(255);
|
|
DECLARE local_uuid VARCHAR(255);
|
|
DECLARE local_time TIMESTAMP;
|
|
SET local_time= NOW();
|
|
SET cur_user= CURRENT_USER();
|
|
SET local_uuid= UUID();
|
|
WHILE ins_count > 0 DO
|
|
INSERT INTO test.regular_tbl VALUES (NULL, NOW(), USER() , UUID(),
|
|
ins_count,'Going to test MBR for MySQL');
|
|
SET ins_count = ins_count - 1;
|
|
END WHILE;
|
|
SELECT MAX(id) FROM test.regular_tbl INTO del_count;
|
|
WHILE del_count > 0 DO
|
|
DELETE FROM test.regular_tbl WHERE id = del_count;
|
|
SET del_count = del_count - 2;
|
|
END WHILE;
|
|
END|
|
|
CREATE PROCEDURE test.proc_bykey()
|
|
BEGIN
|
|
DECLARE ins_count INT DEFAULT 1000;
|
|
DECLARE del_count INT;
|
|
DECLARE cur_user VARCHAR(255);
|
|
DECLARE local_uuid VARCHAR(255);
|
|
DECLARE local_time TIMESTAMP;
|
|
SET local_time= NOW();
|
|
SET cur_user= CURRENT_USER();
|
|
SET local_uuid= UUID();
|
|
WHILE ins_count > 0 DO
|
|
INSERT INTO test.bykey_tbl VALUES (NULL, NOW(), USER() , UUID(),
|
|
ins_count,'Going to test MBR for MySQL');
|
|
SET ins_count = ins_count - 1;
|
|
END WHILE;
|
|
SELECT MAX(id) FROM test.bykey_tbl INTO del_count;
|
|
WHILE del_count > 0 DO
|
|
DELETE FROM test.bykey_tbl WHERE id = del_count;
|
|
SET del_count = del_count - 2;
|
|
END WHILE;
|
|
END|
|
|
CREATE PROCEDURE test.proc_byrange()
|
|
BEGIN
|
|
DECLARE ins_count INT DEFAULT 1000;
|
|
DECLARE del_count INT;
|
|
DECLARE cur_user VARCHAR(255);
|
|
DECLARE local_uuid VARCHAR(255);
|
|
DECLARE local_time TIMESTAMP;
|
|
SET local_time= NOW();
|
|
SET cur_user = CURRENT_USER();
|
|
SET local_uuid=UUID();
|
|
WHILE ins_count > 0 DO
|
|
INSERT INTO test.byrange_tbl VALUES (NULL, NOW(), USER(), UUID(),
|
|
ins_count,'Going to test MBR for MySQL');
|
|
SET ins_count = ins_count - 1;
|
|
END WHILE;
|
|
SELECT MAX(id) FROM test.byrange_tbl INTO del_count;
|
|
WHILE del_count > 0 DO
|
|
DELETE FROM test.byrange_tbl WHERE id = del_count;
|
|
SET del_count = del_count - 2;
|
|
END WHILE;
|
|
END|
|
|
begin;
|
|
CALL test.proc_norm();
|
|
commit;
|
|
SELECT count(*) as "Master regular" FROM test.regular_tbl;
|
|
Master regular 500
|
|
begin;
|
|
CALL test.proc_bykey();
|
|
commit;
|
|
SELECT count(*) as "Master bykey" FROM test.bykey_tbl;
|
|
Master bykey 500
|
|
begin;
|
|
CALL test.proc_byrange();
|
|
commit;
|
|
SELECT count(*) as "Master byrange" FROM test.byrange_tbl;
|
|
Master byrange 500
|
|
show create table test.byrange_tbl;
|
|
Table byrange_tbl
|
|
Create Table CREATE TABLE `byrange_tbl` (
|
|
`id` mediumint(9) NOT NULL AUTO_INCREMENT,
|
|
`dt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
`user` char(255) DEFAULT NULL,
|
|
`uuidf` longblob,
|
|
`fkid` mediumint(9) DEFAULT NULL,
|
|
`filler` varchar(255) DEFAULT NULL,
|
|
PRIMARY KEY (`id`)
|
|
) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=latin1
|
|
/*!50100 PARTITION BY RANGE (id)
|
|
SUBPARTITION BY HASH (id)
|
|
SUBPARTITIONS 2
|
|
(PARTITION pa1 VALUES LESS THAN (10) ENGINE = InnoDB,
|
|
PARTITION pa2 VALUES LESS THAN (20) ENGINE = InnoDB,
|
|
PARTITION pa3 VALUES LESS THAN (30) ENGINE = InnoDB,
|
|
PARTITION pa4 VALUES LESS THAN (40) ENGINE = InnoDB,
|
|
PARTITION pa5 VALUES LESS THAN (50) ENGINE = InnoDB,
|
|
PARTITION pa6 VALUES LESS THAN (60) ENGINE = InnoDB,
|
|
PARTITION pa7 VALUES LESS THAN (70) ENGINE = InnoDB,
|
|
PARTITION pa8 VALUES LESS THAN (80) ENGINE = InnoDB,
|
|
PARTITION pa9 VALUES LESS THAN (90) ENGINE = InnoDB,
|
|
PARTITION pa10 VALUES LESS THAN (100) ENGINE = InnoDB,
|
|
PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
|
|
SELECT count(*) "Slave norm" FROM test.regular_tbl;
|
|
Slave norm 500
|
|
SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
|
|
Slave bykey 500
|
|
SELECT count(*) "Slave byrange" FROM test.byrange_tbl;
|
|
Slave byrange 500
|
|
DROP PROCEDURE test.proc_norm;
|
|
DROP PROCEDURE test.proc_bykey;
|
|
DROP PROCEDURE test.proc_byrange;
|
|
DROP TABLE test.regular_tbl;
|
|
DROP TABLE test.bykey_tbl;
|
|
DROP TABLE test.byrange_tbl;
|
|
include/rpl_end.inc
|