database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Changes to some MTR cases so that they would match in VMs and Docker image runs (#2447)

Browse Source 
* Need to add order by clause since different test run would return rows in different order

* Avoid warning regarding undeterministic functions when binlog is enabled

* Added missing drop database statement

* Added reference result files

* Added order by clause to more queries
This commit is contained in:
Daniel Lee
2022-07-12 09:14:38 -05:00
committed by GitHub
parent 5ce7c3e3ff
commit 2f4108be00
12 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/columnstore/basic/r/ctype_extent_koi8u.result
View File

@ -1,3 +1,4 @@
SET GLOBAL log_bin_trust_function_creators = 1;
DROP DATABASE IF EXISTS mcs_ctype_extent_koi8u;
CREATE DATABASE mcs_ctype_extent_koi8u;
USE mcs_ctype_extent_koi8u;

1
mysql-test/columnstore/basic/r/ctype_extent_latin1.result
View File

@ -1,3 +1,4 @@
SET GLOBAL log_bin_trust_function_creators = 1;
DROP DATABASE IF EXISTS mcs_ctype_extent_latin1;
CREATE DATABASE mcs_ctype_extent_latin1;
USE mcs_ctype_extent_latin1;

1
mysql-test/columnstore/basic/r/ctype_extent_utf8mb3.result
View File

@ -1,3 +1,4 @@
SET GLOBAL log_bin_trust_function_creators = 1;
DROP DATABASE IF EXISTS mcs_ctype_extent_utf8mb3;
CREATE DATABASE mcs_ctype_extent_utf8mb3;
USE mcs_ctype_extent_utf8mb3;

14
mysql-test/columnstore/basic/r/mcol3738_count_distinct_multiparm.result
View File

@ -32,32 +32,32 @@ idx count(distinct c1, c2) count(distinct c1, c3, char1)
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1;
avg(distinct c2) count(c2) count( distinct c2, c3) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3)
3.0000 12 12 12 9 3.0000 12
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1;
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7;
avg(distinct c2) count(c2) count( distinct c2, c3) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3)
3.0000 6 6 6 9 2.0000 6
3.0000 6 6 6 9 3.6667 6
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2) from t1 group by c1;
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7;
avg(distinct c2) count(c2) count( distinct c2, c3) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2)
3.0000 6 6 6 9 2.0000 3
3.0000 6 6 6 9 3.6667 3
select avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1;
select avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7;
avg(distinct c2) count(c2) count( distinct c2) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3)
3.0000 6 3 6 9 2.0000 6
3.0000 6 3 6 9 3.6667 6
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1;
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1 order by 1, 2, 3, 4, 5, 6, 7;
group_concat(distinct char1) avg(distinct c2) count(c2) count( distinct c2) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3, c1)
elsewhere this way comes,something this way comes 3.0000 12 3 12 9 3.0000 12
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1;
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7;
group_concat(distinct char1) avg(distinct c2) count(c2) count( distinct c2) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3)
elsewhere this way comes,something this way comes 3.0000 6 3 6 9 2.0000 6
elsewhere this way comes,something this way comes 3.0000 6 3 6 9 3.6667 6
select idx, sum(c3), count(distinct c1, c2), count(distinct c1, c3, char1), group_concat("ls_", char1) from t1 group by idx order by idx;
select idx, sum(c3), count(distinct c1, c2), count(distinct c1, c3, char1), group_concat("ls_", char1) from t1 group by idx order by 1, 2, 3, 4, 5;
idx sum(c3) count(distinct c1, c2) count(distinct c1, c3, char1) group_concat("ls_", char1)
1 9 6 4 ls_something this way comes,ls_elsewhere this way comes,ls_something this way comes,ls_something this way comes,ls_elsewhere this way comes,ls_elsewhere this way comes
2 9 3 2 ls_something this way comes,ls_elsewhere this way comes,ls_something this way comes
3 8 2 2 ls_something this way comes,ls_elsewhere this way comes
4 5 1 1 ls_elsewhere this way comes
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1;
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1 order by 1, 2, 3, 4, 5, 6, 7;
group_concat(distinct char1) avg(distinct c2) count(c2) count( distinct c2) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3, c1)
elsewhere this way comes,something this way comes 3.0000 12 3 12 9 3.0000 12
DROP DATABASE mcol_3738_db;

1
mysql-test/columnstore/basic/r/mcol4766-rollback-ranges.result
View File

@ -25,3 +25,4 @@ SELECT * FROM t;
x
1
2
DROP DATABASE MCOL4766;

1
mysql-test/columnstore/basic/r/mcs39_select_function_calls.result
View File

@ -1,3 +1,4 @@
SET GLOBAL log_bin_trust_function_creators = 1;
DROP DATABASE IF EXISTS mcs39_db;
CREATE DATABASE mcs39_db;
USE mcs39_db;

1
mysql-test/columnstore/basic/t/ctype_extent_koi8u.test
View File

@ -1,5 +1,6 @@
--source ../include/have_columnstore.inc
--source ../include/func_caltrace_create_if_needed.inc
SET GLOBAL log_bin_trust_function_creators = 1;
--disable_warnings
DROP DATABASE IF EXISTS mcs_ctype_extent_koi8u;
--enable_warnings

1
mysql-test/columnstore/basic/t/ctype_extent_latin1.test
View File

@ -1,5 +1,6 @@
--source ../include/have_columnstore.inc
--source ../include/func_caltrace_create_if_needed.inc
SET GLOBAL log_bin_trust_function_creators = 1;
--disable_warnings
DROP DATABASE IF EXISTS mcs_ctype_extent_latin1;
--enable_warnings

1
mysql-test/columnstore/basic/t/ctype_extent_utf8mb3.test
View File

@ -1,5 +1,6 @@
--source ../include/have_columnstore.inc
--source ../include/func_caltrace_create_if_needed.inc
SET GLOBAL log_bin_trust_function_creators = 1;
--disable_warnings
DROP DATABASE IF EXISTS mcs_ctype_extent_utf8mb3;
--enable_warnings

14
mysql-test/columnstore/basic/t/mcol3738_count_distinct_multiparm.test
View File

@ -34,15 +34,15 @@ insert into t1 values (1, 2, 2, 1, "something this way comes"),
select count(distinct c1, c2), count(distinct char1) from t1;
select idx, count(distinct c1, c2), count(distinct c1, c3, char1) from t1 group by idx order by idx;
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1;
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1;
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2) from t1 group by c1;
select avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1;
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1;
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7;
select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7;
select avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7;
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1 order by 1, 2, 3, 4, 5, 6, 7;
# group_concat causes the aggregation to be performed on UM only.
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1;
select idx, sum(c3), count(distinct c1, c2), count(distinct c1, c3, char1), group_concat("ls_", char1) from t1 group by idx order by idx;
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1;
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7;
select idx, sum(c3), count(distinct c1, c2), count(distinct c1, c3, char1), group_concat("ls_", char1) from t1 group by idx order by 1, 2, 3, 4, 5;
select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1 order by 1, 2, 3, 4, 5, 6, 7;
# Clean UP
DROP DATABASE mcol_3738_db;

1
mysql-test/columnstore/basic/t/mcol4766-rollback-ranges.test
View File

@ -16,3 +16,4 @@ SELECT c.table_schema, c.table_name, c.column_name, e.min_value, e.max_value FRO
ROLLBACK;
SELECT c.table_schema, c.table_name, c.column_name, e.min_value, e.max_value FROM information_schema.columnstore_extents e, information_schema.columnstore_columns c WHERE c.table_schema='MCOL4766' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
SELECT * FROM t;
DROP DATABASE MCOL4766;

2
mysql-test/columnstore/basic/t/mcs39_select_function_calls.test
View File

@ -3,7 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com
#
-- source ../include/have_columnstore.inc
SET GLOBAL log_bin_trust_function_creators = 1;
--disable_warnings
DROP DATABASE IF EXISTS mcs39_db;
--enable_warnings