database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #2517 from mariadb-corporation/dlee_mtr_cleanup_2208

Browse Source 
Dlee mtr cleanup 2208
This commit is contained in:
Roman Nozdrin
2022-08-22 15:26:52 +03:00
committed by GitHub
parent 8a08df24d3 54329d3ab8
commit bbb3c69e31
17 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mysql-test/columnstore/autopilot/.DS_Store vendored
View File

Binary file not shown.

4
mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result
View File

@ -18,9 +18,7 @@ cInt cVarchar cText
1 [1, 2] [1, 2] 1 [1, 2] [1, 2]
1 [3, 4] [3, 4] 1 [3, 4] [3, 4]
SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest; SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest;
cVarchar JSON_MERGE(cVarchar, @json2) cText JSON_MERGE(cText, @json2) ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_merge_preserve' isn't supported.
[1, 2] [1, 2, 3, 4] [1, 2] [1, 2, 3, 4]
[3, 4] [3, 4, 3, 4] [3, 4] [3, 4, 3, 4]
SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest; SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest;
ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_merge_preserve' isn't supported. ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_merge_preserve' isn't supported.
TRUNCATE TABLE jsontest; TRUNCATE TABLE jsontest;

1
mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test
View File

@ -19,6 +19,7 @@ INSERT INTO jsontest VALUES (1, @json2, @json2);
SELECT JSON_MERGE(@json1,@json2); SELECT JSON_MERGE(@json1,@json2);
# #
SELECT * FROM jsontest; SELECT * FROM jsontest;
--error 1178
SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest; SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest;
--error 1178 --error 1178
SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest; SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest;

2
mysql-test/columnstore/devregression/r/mcs7071_regression_bug3334_ceil.result
View File

@ -32761,7 +32761,7 @@ ceil(d134/3) 9 1.603540000000000000 2
ceil(d134/3) 10 0.057843666666666667 1 ceil(d134/3) 10 0.057843666666666667 1
ceil(d134/3) 11 3.333333333333330000 4 ceil(d134/3) 11 3.333333333333330000 4
ceil(d134/3) 12 -2.211013333333333333 -2 ceil(d134/3) 12 -2.211013333333333333 -2
ceil(d134/3) 13 3.163913333333333334 4 ceil(d134/3) 13 3.163913333333333333 4
ceil(d134/3) 14 0.303364666666666667 1 ceil(d134/3) 14 0.303364666666666667 1
ceil(d134/3) 15 3.333333333333330000 4 ceil(d134/3) 15 3.333333333333330000 4
ceil(d134/3) 16 -1.926550000000000000 -1 ceil(d134/3) 16 -1.926550000000000000 -1

2
mysql-test/columnstore/devregression/r/mcs7085_regression_bug3483.result
View File

@ -41,7 +41,7 @@ c2 ceil(c2) ceiling(c2) floor(c2) truncate(c2, 2)
-1.10 -1 -1 -2 -1.10 -1.10 -1 -1 -2 -1.10
-1234567890.10 -1234567890 -1234567890 -1234567891 -1234567890.10 -1234567890.10 -1234567890 -1234567890 -1234567891 -1234567890.10
-1234567890.80 -1234567890 -1234567890 -1234567891 -1234567890.80 -1234567890.80 -1234567890 -1234567890 -1234567891 -1234567890.80
-12345678901.00 -12345678901 -12345678901 -12345678902 -12345678901.00 -12345678901.00 -12345678901 -12345678901 -12345678901 -12345678901.00
-1234567890123456.78 -1234567890123456 -1234567890123456 -1234567890123457 -1234567890123456.78 -1234567890123456.78 -1234567890123456 -1234567890123456 -1234567890123457 -1234567890123456.78
-1234567890987654.32 -1234567890987654 -1234567890987654 -1234567890987655 -1234567890987654.32 -1234567890987654.32 -1234567890987654 -1234567890987654 -1234567890987655 -1234567890987654.32
select c4, ceil(c4), ceiling(c4), floor(c4) from bug3483; select c4, ceil(c4), ceiling(c4), floor(c4) from bug3483;

6
mysql-test/columnstore/devregression/r/mcs7184_regression_bug5715.result
View File

@ -21,13 +21,13 @@ select (count(*)/72143371)*100,(6001215/72143371)*100,(count(*)*100)/72143371,(6
set columnstore_double_for_decimal_math = 0; set columnstore_double_for_decimal_math = 0;
select session_duration as session_duration, session_idle_down_duration as session_idle_down_duration, session_q5_down as session_q5_down, session_duration*session_q5_down as result_1, (session_duration*session_q5_down)*8 as result_2, (1032632.1*1273564557)*8 as result_3 from p2_loaded_uh_p_xml_fsc_2x_for_agg_201310_valid_sess t1; select session_duration as session_duration, session_idle_down_duration as session_idle_down_duration, session_q5_down as session_q5_down, session_duration*session_q5_down as result_1, (session_duration*session_q5_down)*8 as result_2, (1032632.1*1273564557)*8 as result_3 from p2_loaded_uh_p_xml_fsc_2x_for_agg_201310_valid_sess t1;
session_duration session_idle_down_duration session_q5_down result_1 result_2 result_3 session_duration session_idle_down_duration session_q5_down result_1 result_2 result_3
1032632.100 86382.000 1273564557 1315123642980479.700 -7925754929865714.016 10520989143843837.6 1032632.100 86382.000 1273564557 1315123642980479.700 10520989143843837.600 10520989143843837.6
select col1*2.0002*2.0000002*0.999999999999 from bug2437; select col1*2.0002*2.0000002*0.999999999999 from bug2437;
col1*2.0002*2.0000002*0.999999999999 col1*2.0002*2.0000002*0.999999999999
0.000000008844817964341929788 40.004404040399999595959559996
select col1*4.00040040003599959959996 from bug2437; select col1*4.00040040003599959959996 from bug2437;
col1*4.00040040003599959959996 col1*4.00040040003599959959996
0.000000009223372036854675807 40.004404040399999595959559996
select (count(*)/72143371)*100,(6001215/72143371)*100,(count(*)*100)/72143371,(6001215*100)/72143371 from lineitem; select (count(*)/72143371)*100,(6001215/72143371)*100,(count(*)*100)/72143371,(6001215*100)/72143371 from lineitem;
(count(*)/72143371)*100 (6001215/72143371)*100 (count(*)*100)/72143371 (6001215*100)/72143371 (count(*)/72143371)*100 (6001215/72143371)*100 (count(*)*100)/72143371 (6001215*100)/72143371
8.3200 8.3185 8.3185 8.3185 8.3200 8.3185 8.3185 8.3185

3
mysql-test/columnstore/devregression/r/mcs7578_j1.result
View File

@ -1,6 +1,4 @@
drop table if exists j1; drop table if exists j1;
Warnings:
Note 1051 Unknown table 'test.j1'
create table j1 (j1_key int)engine=columnstore; create table j1 (j1_key int)engine=columnstore;
insert into j1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(null); insert into j1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(null);
select * from j1; select * from j1;
@ -21,3 +19,4 @@ j1_key
14 14
15 15
NULL NULL
drop table j1;

1
mysql-test/columnstore/devregression/r/mcs7579_j11.result
View File

@ -19,3 +19,4 @@ j11_key
24 24
25 25
NULL NULL
drop table j11;

1
mysql-test/columnstore/devregression/r/mcs7580_j16.result
View File

@ -19,3 +19,4 @@ j16_key
29 29
30 30
NULL NULL
drop table j16;

1
mysql-test/columnstore/devregression/r/mcs7581_j6.result
View File

@ -19,3 +19,4 @@ j6_key
19 19
20 20
NULL NULL
drop table j6;

1
mysql-test/columnstore/devregression/r/mcs7637_q214.result
View File

@ -2,4 +2,5 @@ USE tpch1;
CREATE TABLE IF NOT EXISTS mcol2219 (`t (space` int) engine=columnstore; CREATE TABLE IF NOT EXISTS mcol2219 (`t (space` int) engine=columnstore;
SELECT column_name FROM information_schema.columnstore_columns WHERE table_name='mcol2219'; SELECT column_name FROM information_schema.columnstore_columns WHERE table_name='mcol2219';
column_name column_name
t (space
DROP TABLE mcol2219; DROP TABLE mcol2219;

3
mysql-test/columnstore/devregression/t/mcs7578_j1.test
View File

@ -7,10 +7,13 @@
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--disable_warnings
drop table if exists j1; drop table if exists j1;
--enable_warnings
create table j1 (j1_key int)engine=columnstore; create table j1 (j1_key int)engine=columnstore;
insert into j1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(null); insert into j1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(null);
select * from j1; select * from j1;
drop table j1;

3
mysql-test/columnstore/devregression/t/mcs7579_j11.test
View File

@ -7,10 +7,13 @@
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--disable_warnings
drop table if exists j11; drop table if exists j11;
--enable_warnings
create table j11 (j11_key int)engine=columnstore; create table j11 (j11_key int)engine=columnstore;
insert into j11 values (11),(12),(13),(14),(15),(16),(17),(18),(19),(20),(21),(22),(23),(24),(25),(null); insert into j11 values (11),(12),(13),(14),(15),(16),(17),(18),(19),(20),(21),(22),(23),(24),(25),(null);
select * from j11; select * from j11;
drop table j11;

3
mysql-test/columnstore/devregression/t/mcs7580_j16.test
View File

@ -7,10 +7,13 @@
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--disable_warnings
drop table if exists j16; drop table if exists j16;
--enable_warnings
create table j16 (j16_key int)engine=columnstore; create table j16 (j16_key int)engine=columnstore;
insert into j16 values (16),(17),(18),(19),(20),(21),(22),(23),(24),(25),(26),(27),(28),(29),(30),(null); insert into j16 values (16),(17),(18),(19),(20),(21),(22),(23),(24),(25),(26),(27),(28),(29),(30),(null);
select * from j16; select * from j16;
drop table j16;

4
mysql-test/columnstore/devregression/t/mcs7581_j6.test
View File

@ -7,11 +7,13 @@
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--disable_warnings
drop table if exists j6; drop table if exists j6;
--enable_warnings
create table j6 (j6_key int)engine=columnstore; create table j6 (j6_key int)engine=columnstore;
insert into j6 values (6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(16),(17),(18),(19),(20),(null); insert into j6 values (6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(16),(17),(18),(19),(20),(null);
select * from j6; select * from j6;
drop table j6;

10
mysql-test/columnstore/extended/r/mcs7000_version_buffer.result
View File

@ -20,21 +20,23 @@ l_shipmode char (10),
l_comment varchar (44) l_comment varchar (44)
) engine=columnstore DEFAULT CHARSET=utf8mb3; ) engine=columnstore DEFAULT CHARSET=utf8mb3;
LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|'; LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
SELECT COUNT(*) FROM lineitem; SELECT COUNT(*) FROM lineitem;
COUNT(*) COUNT(*)
59986052 179958156
SET autocommit=off; SET autocommit=off;
UPDATE lineitem SET l_orderkey=-1, l_linenumber=-1; UPDATE lineitem SET l_orderkey=-1, l_linenumber=-1;
SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1; SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1;
COUNT(*) COUNT(*)
59986052 179958156
rollback; rollback;
SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1; SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1;
COUNT(*) COUNT(*)
0 0
update lineitem set l_orderkey=-2, l_linenumber=-2,l_comment='hello'; update lineitem set l_orderkey=-2, l_linenumber=-2, l_comment='hello', l_shipinstruct=l_shipmode;
ERROR HY000: Internal error: CAL0002: Update Failed: MCS-2008: The version buffer overflowed. Increase VersionBufferFileSize or limit the rows to be processed. ERROR HY000: Internal error: CAL0002: Update Failed: MCS-2008: The version buffer overflowed. Increase VersionBufferFileSize or limit the rows to be processed.
SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and l_comment='hello'; SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and l_comment='hello' and l_shipinstruct=l_shipmode;
COUNT(*) COUNT(*)
0 0
DROP DATABASE mcs7000_db; DROP DATABASE mcs7000_db;

6
mysql-test/columnstore/extended/t/mcs7000_version_buffer.test
View File

@ -37,6 +37,8 @@ l_comment varchar (44)
# LDI 10g dataset for the lineitem table # LDI 10g dataset for the lineitem table
# -------------------------------------------------------------- # # -------------------------------------------------------------- #
LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|'; LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
SELECT COUNT(*) FROM lineitem; SELECT COUNT(*) FROM lineitem;
# #
# Version buffer positive test - successful update expected # Version buffer positive test - successful update expected
@ -48,8 +50,8 @@ SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1;
# Version buffer negative test - overflow error expected # Version buffer negative test - overflow error expected
--error 1815 --error 1815
--error ER_INTERNAL_ERROR --error ER_INTERNAL_ERROR
update lineitem set l_orderkey=-2, l_linenumber=-2,l_comment='hello'; update lineitem set l_orderkey=-2, l_linenumber=-2, l_comment='hello', l_shipinstruct=l_shipmode;
SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and l_comment='hello'; SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and l_comment='hello' and l_shipinstruct=l_shipmode;
# #
DROP DATABASE mcs7000_db; DROP DATABASE mcs7000_db;
# #