From 10a8d274cd3193cb924cc68348243b1a99069a60 Mon Sep 17 00:00:00 2001 From: mariadb-DanielLee Date: Wed, 17 Aug 2022 11:28:05 -0500 Subject: [PATCH 1/4] Updated reference results to match that of innodb tables --- .../devregression/r/mcs7071_regression_bug3334_ceil.result | 2 +- .../devregression/r/mcs7085_regression_bug3483.result | 2 +- .../devregression/r/mcs7184_regression_bug5715.result | 6 +++--- mysql-test/columnstore/devregression/r/mcs7637_q214.result | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mysql-test/columnstore/devregression/r/mcs7071_regression_bug3334_ceil.result b/mysql-test/columnstore/devregression/r/mcs7071_regression_bug3334_ceil.result index 84acfad46..abf99ed3c 100644 --- a/mysql-test/columnstore/devregression/r/mcs7071_regression_bug3334_ceil.result +++ b/mysql-test/columnstore/devregression/r/mcs7071_regression_bug3334_ceil.result @@ -32761,7 +32761,7 @@ ceil(d134/3) 9 1.603540000000000000 2 ceil(d134/3) 10 0.057843666666666667 1 ceil(d134/3) 11 3.333333333333330000 4 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) 15 3.333333333333330000 4 ceil(d134/3) 16 -1.926550000000000000 -1 diff --git a/mysql-test/columnstore/devregression/r/mcs7085_regression_bug3483.result b/mysql-test/columnstore/devregression/r/mcs7085_regression_bug3483.result index 9715f3cf1..c845ac43f 100644 --- a/mysql-test/columnstore/devregression/r/mcs7085_regression_bug3483.result +++ b/mysql-test/columnstore/devregression/r/mcs7085_regression_bug3483.result @@ -41,7 +41,7 @@ c2 ceil(c2) ceiling(c2) floor(c2) truncate(c2, 2) -1.10 -1 -1 -2 -1.10 -1234567890.10 -1234567890 -1234567890 -1234567891 -1234567890.10 -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 -1234567890987654.32 -1234567890987654 -1234567890987654 -1234567890987655 -1234567890987654.32 select c4, ceil(c4), ceiling(c4), floor(c4) from bug3483; diff --git a/mysql-test/columnstore/devregression/r/mcs7184_regression_bug5715.result b/mysql-test/columnstore/devregression/r/mcs7184_regression_bug5715.result index 27860361c..3e97874aa 100644 --- a/mysql-test/columnstore/devregression/r/mcs7184_regression_bug5715.result +++ b/mysql-test/columnstore/devregression/r/mcs7184_regression_bug5715.result @@ -21,13 +21,13 @@ select (count(*)/72143371)*100,(6001215/72143371)*100,(count(*)*100)/72143371,(6 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; 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; col1*2.0002*2.0000002*0.999999999999 -0.000000008844817964341929788 +40.004404040399999595959559996 select col1*4.00040040003599959959996 from bug2437; col1*4.00040040003599959959996 -0.000000009223372036854675807 +40.004404040399999595959559996 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 8.3200 8.3185 8.3185 8.3185 diff --git a/mysql-test/columnstore/devregression/r/mcs7637_q214.result b/mysql-test/columnstore/devregression/r/mcs7637_q214.result index 12afca85f..b43ad18aa 100644 --- a/mysql-test/columnstore/devregression/r/mcs7637_q214.result +++ b/mysql-test/columnstore/devregression/r/mcs7637_q214.result @@ -2,4 +2,5 @@ USE tpch1; CREATE TABLE IF NOT EXISTS mcol2219 (`t (space` int) engine=columnstore; SELECT column_name FROM information_schema.columnstore_columns WHERE table_name='mcol2219'; column_name +t (space DROP TABLE mcol2219; From 8166e0284fe791266a05ae4774050083b655e367 Mon Sep 17 00:00:00 2001 From: mariadb-DanielLee Date: Wed, 17 Aug 2022 11:29:04 -0500 Subject: [PATCH 2/4] Disabled warnings and add drop table commands --- mysql-test/columnstore/devregression/r/mcs7579_j11.result | 1 + mysql-test/columnstore/devregression/r/mcs7580_j16.result | 1 + mysql-test/columnstore/devregression/r/mcs7581_j6.result | 1 + mysql-test/columnstore/devregression/t/mcs7579_j11.test | 3 +++ mysql-test/columnstore/devregression/t/mcs7580_j16.test | 3 +++ mysql-test/columnstore/devregression/t/mcs7581_j6.test | 4 +++- 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mysql-test/columnstore/devregression/r/mcs7579_j11.result b/mysql-test/columnstore/devregression/r/mcs7579_j11.result index 88399a816..dc040b761 100644 --- a/mysql-test/columnstore/devregression/r/mcs7579_j11.result +++ b/mysql-test/columnstore/devregression/r/mcs7579_j11.result @@ -19,3 +19,4 @@ j11_key 24 25 NULL +drop table j11; diff --git a/mysql-test/columnstore/devregression/r/mcs7580_j16.result b/mysql-test/columnstore/devregression/r/mcs7580_j16.result index 1ef8ba630..01599ab1b 100644 --- a/mysql-test/columnstore/devregression/r/mcs7580_j16.result +++ b/mysql-test/columnstore/devregression/r/mcs7580_j16.result @@ -19,3 +19,4 @@ j16_key 29 30 NULL +drop table j16; diff --git a/mysql-test/columnstore/devregression/r/mcs7581_j6.result b/mysql-test/columnstore/devregression/r/mcs7581_j6.result index ee9095949..85f26e943 100644 --- a/mysql-test/columnstore/devregression/r/mcs7581_j6.result +++ b/mysql-test/columnstore/devregression/r/mcs7581_j6.result @@ -19,3 +19,4 @@ j6_key 19 20 NULL +drop table j6; diff --git a/mysql-test/columnstore/devregression/t/mcs7579_j11.test b/mysql-test/columnstore/devregression/t/mcs7579_j11.test index a272cb41f..a06a0f73b 100644 --- a/mysql-test/columnstore/devregression/t/mcs7579_j11.test +++ b/mysql-test/columnstore/devregression/t/mcs7579_j11.test @@ -7,10 +7,13 @@ -- source ../include/have_columnstore.inc +--disable_warnings drop table if exists j11; +--enable_warnings 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); select * from j11; +drop table j11; diff --git a/mysql-test/columnstore/devregression/t/mcs7580_j16.test b/mysql-test/columnstore/devregression/t/mcs7580_j16.test index 5b762579d..79d11200e 100644 --- a/mysql-test/columnstore/devregression/t/mcs7580_j16.test +++ b/mysql-test/columnstore/devregression/t/mcs7580_j16.test @@ -7,10 +7,13 @@ -- source ../include/have_columnstore.inc +--disable_warnings drop table if exists j16; +--enable_warnings 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); select * from j16; +drop table j16; diff --git a/mysql-test/columnstore/devregression/t/mcs7581_j6.test b/mysql-test/columnstore/devregression/t/mcs7581_j6.test index d165078fa..a7b6f8fac 100644 --- a/mysql-test/columnstore/devregression/t/mcs7581_j6.test +++ b/mysql-test/columnstore/devregression/t/mcs7581_j6.test @@ -7,11 +7,13 @@ -- source ../include/have_columnstore.inc +--disable_warnings drop table if exists j6; - +--enable_warnings 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); select * from j6; +drop table j6; From 471b8e3e09fb882f7d74dfcc96a224a207a26463 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Aug 2022 16:56:26 +0000 Subject: [PATCH 3/4] Updated test case --- mysql-test/columnstore/devregression/r/mcs7578_j1.result | 3 +-- mysql-test/columnstore/devregression/t/mcs7578_j1.test | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mysql-test/columnstore/devregression/r/mcs7578_j1.result b/mysql-test/columnstore/devregression/r/mcs7578_j1.result index 79648030e..87aa877a1 100644 --- a/mysql-test/columnstore/devregression/r/mcs7578_j1.result +++ b/mysql-test/columnstore/devregression/r/mcs7578_j1.result @@ -1,6 +1,4 @@ drop table if exists j1; -Warnings: -Note 1051 Unknown table 'test.j1' 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); select * from j1; @@ -21,3 +19,4 @@ j1_key 14 15 NULL +drop table j1; diff --git a/mysql-test/columnstore/devregression/t/mcs7578_j1.test b/mysql-test/columnstore/devregression/t/mcs7578_j1.test index c6fc48ea7..22a587419 100644 --- a/mysql-test/columnstore/devregression/t/mcs7578_j1.test +++ b/mysql-test/columnstore/devregression/t/mcs7578_j1.test @@ -7,10 +7,13 @@ -- source ../include/have_columnstore.inc +--disable_warnings drop table if exists j1; +--enable_warnings 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); select * from j1; +drop table j1; From 54329d3ab8a5ac5f8b6cc7662e699f10126c0097 Mon Sep 17 00:00:00 2001 From: mariadb-DanielLee Date: Thu, 18 Aug 2022 21:08:05 -0500 Subject: [PATCH 4/4] Updated autopilot adn extended cases --- mysql-test/columnstore/autopilot/.DS_Store | Bin 6148 -> 0 bytes .../r/mcs6735_json_JSON_MERGE_KnownIssue.result | 4 +--- .../t/mcs6735_json_JSON_MERGE_KnownIssue.test | 1 + .../extended/r/mcs7000_version_buffer.result | 10 ++++++---- .../extended/t/mcs7000_version_buffer.test | 6 ++++-- 5 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 mysql-test/columnstore/autopilot/.DS_Store diff --git a/mysql-test/columnstore/autopilot/.DS_Store b/mysql-test/columnstore/autopilot/.DS_Store deleted file mode 100644 index 753f68f75c151e83a3d503f78f5ae35b5c87cc9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z<-bwiF=;g&r5Y7HpAf#Y>3w1&ruHr6#0kFlI}WnnNk%tS{t~_&m<+ zY^cSaMPvqczxmzWe31PSLP&2O^@VVR5KU-^5|s^t?v0@>n~W%N3>|{@5l)jh%Wdqh z1Fby|i)*s0 z;o0T*IeAI-8&N5NX(PK9D|iP*iu~1|rHM`-ja9`MnE_^i8DIvOffWPxBx$x+F4mX< zW`G$m4B-Btpdq>zOG2}CK!?|7jMouSK*zTPqO#~(ED0e3BB>ORN~L{bNGb=vvU#q> zl90-UG&93EcIN8wBF*gJS0-IZmymmAfEie4phl*H=l=!#G8-TH>m_V41I)lbV?fqN z{>X!mvS;g$&%?7;L3@CPf_Wt>AfT^Z0>Hq1q+@~O0DL}2@Bjb+ diff --git a/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result index e28ac9864..1cc5312ea 100644 --- a/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result +++ b/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result @@ -18,9 +18,7 @@ cInt cVarchar cText 1 [1, 2] [1, 2] 1 [3, 4] [3, 4] SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest; -cVarchar JSON_MERGE(cVarchar, @json2) cText JSON_MERGE(cText, @json2) -[1, 2] [1, 2, 3, 4] [1, 2] [1, 2, 3, 4] -[3, 4] [3, 4, 3, 4] [3, 4] [3, 4, 3, 4] +ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_merge_preserve' isn't supported. 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. TRUNCATE TABLE jsontest; diff --git a/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test index a1905f729..22b8e8a63 100644 --- a/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test +++ b/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test @@ -19,6 +19,7 @@ INSERT INTO jsontest VALUES (1, @json2, @json2); SELECT JSON_MERGE(@json1,@json2); # SELECT * FROM jsontest; +--error 1178 SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest; --error 1178 SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest; diff --git a/mysql-test/columnstore/extended/r/mcs7000_version_buffer.result b/mysql-test/columnstore/extended/r/mcs7000_version_buffer.result index c07bdfce7..569b49ef0 100644 --- a/mysql-test/columnstore/extended/r/mcs7000_version_buffer.result +++ b/mysql-test/columnstore/extended/r/mcs7000_version_buffer.result @@ -20,21 +20,23 @@ l_shipmode char (10), l_comment varchar (44) ) 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 '|'; SELECT COUNT(*) FROM lineitem; COUNT(*) -59986052 +179958156 SET autocommit=off; UPDATE lineitem SET l_orderkey=-1, l_linenumber=-1; SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1; COUNT(*) -59986052 +179958156 rollback; SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1; COUNT(*) 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. -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(*) 0 DROP DATABASE mcs7000_db; diff --git a/mysql-test/columnstore/extended/t/mcs7000_version_buffer.test b/mysql-test/columnstore/extended/t/mcs7000_version_buffer.test index 5e8a3ca13..db4b43de5 100644 --- a/mysql-test/columnstore/extended/t/mcs7000_version_buffer.test +++ b/mysql-test/columnstore/extended/t/mcs7000_version_buffer.test @@ -37,6 +37,8 @@ l_comment varchar (44) # 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 '|'; SELECT COUNT(*) FROM lineitem; # # 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 --error 1815 --error ER_INTERNAL_ERROR -update lineitem set l_orderkey=-2, l_linenumber=-2,l_comment='hello'; -SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and 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' and l_shipinstruct=l_shipmode; # DROP DATABASE mcs7000_db; #