From 54329d3ab8a5ac5f8b6cc7662e699f10126c0097 Mon Sep 17 00:00:00 2001 From: mariadb-DanielLee Date: Thu, 18 Aug 2022 21:08:05 -0500 Subject: [PATCH] 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; #