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

MCOL-5519: new defaults in columnstore.cnf (#2894)

Browse Source 
feat(charset)!: utf8 is a new charset default and utf8_general_ci is a new collation default in the engine configuration file shipped
---------

Co-authored-by: Leonid Fedorov <leonid.fedorov@mariadb.com>
Co-authored-by: mariadb-DanielLee <daniel.lee@mariadb.com>
This commit is contained in:
mariadb-AlexeyVorovich
2023-08-15 11:04:32 -04:00
committed by GitHub
parent 712d34a407
commit 64f1d541d0
50 changed files with 139 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ orders CREATE TABLE `orders` (
`o_clerk` char(15) DEFAULT NULL,
`o_shippriority` int(11) DEFAULT NULL,
`o_comment` varchar(79) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
set columnstore_compression_type=1;
CREATE TABLE lineitem (
l_orderkey int,
@ -65,7 +65,7 @@ lineitem CREATE TABLE `lineitem` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs4000_db';
schema tablename columnname compressiontype
mcs4000_db orders o_orderkey 2

2
mysql-test/columnstore/autopilot/r/mcs4001_autopilot_wide_table_600columns.result
View File

File diff suppressed because one or more lines are too long

2
mysql-test/columnstore/autopilot/r/mcs4002_autopilot_large_insert.result
View File

@ -39,7 +39,7 @@ lineitem CREATE TABLE `lineitem` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
insert into lineitem values
(10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'),
(10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'),

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

@ -39,7 +39,7 @@ lineitem CREATE TABLE `lineitem` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists lineitem1;
create table lineitem1 (
l_orderkey int,
@ -78,7 +78,7 @@ lineitem1 CREATE TABLE `lineitem1` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
insert into lineitem values
(10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'),
(10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'),

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

@ -39,7 +39,7 @@ lineitem CREATE TABLE `lineitem` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists lineitem1;
create table lineitem1 (
l_orderkey int,
@ -78,7 +78,7 @@ lineitem1 CREATE TABLE `lineitem1` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
insert into lineitem values
(10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'),
(10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'),

2
mysql-test/columnstore/autopilot/r/mcs4005_autopilot_add_drop_columns.result
View File

@ -39,7 +39,7 @@ lineitem CREATE TABLE `lineitem` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
alter table lineitem add column CBIGINT BIGINT;
alter table lineitem add column CDECIMAL1 DECIMAL(1);
alter table lineitem add column CDECIMAL4 DECIMAL(4);

16
mysql-test/columnstore/autopilot/r/mcs4006_autopilot_create_dbt3_database_1m.result
View File

@ -16,7 +16,7 @@ nation CREATE TABLE `nation` (
`n_name` char(25) DEFAULT NULL,
`n_regionkey` int(11) DEFAULT NULL,
`n_comment` varchar(152) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists region;
create table region (
r_regionkey int,
@ -29,7 +29,7 @@ region CREATE TABLE `region` (
`r_regionkey` int(11) DEFAULT NULL,
`r_name` char(25) DEFAULT NULL,
`r_comment` varchar(152) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists customer;
create table customer (
c_custkey int,
@ -52,7 +52,7 @@ customer CREATE TABLE `customer` (
`c_acctbal` decimal(12,2) DEFAULT NULL,
`c_mktsegment` char(10) DEFAULT NULL,
`c_comment` varchar(117) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists orders;
create table orders (
o_orderkey int,
@ -77,7 +77,7 @@ orders CREATE TABLE `orders` (
`o_clerk` char(15) DEFAULT NULL,
`o_shippriority` int(11) DEFAULT NULL,
`o_comment` varchar(79) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists supplier;
create table supplier (
s_suppkey int,
@ -98,7 +98,7 @@ supplier CREATE TABLE `supplier` (
`s_phone` char(15) DEFAULT NULL,
`s_acctbal` decimal(12,2) DEFAULT NULL,
`s_comment` varchar(101) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists partsupp;
create table partsupp (
ps_partkey int,
@ -115,7 +115,7 @@ partsupp CREATE TABLE `partsupp` (
`ps_availqty` int(11) DEFAULT NULL,
`ps_supplycost` decimal(12,2) DEFAULT NULL,
`ps_comment` varchar(199) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists part;
create table part (
p_partkey int,
@ -140,7 +140,7 @@ part CREATE TABLE `part` (
`p_container` char(10) DEFAULT NULL,
`p_retailprice` decimal(12,2) DEFAULT NULL,
`p_comment` varchar(23) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists lineitem;
create table lineitem (
l_orderkey int,
@ -179,7 +179,7 @@ lineitem CREATE TABLE `lineitem` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
LOAD DATA INFILE '/data/qa/source/dbt3/1m/nation.tbl' INTO TABLE nation FIELDS TERMINATED BY '|';
LOAD DATA INFILE '/data/qa/source/dbt3/1m/region.tbl' INTO TABLE region FIELDS TERMINATED BY '|';
LOAD DATA INFILE '/data/qa/source/dbt3/1m/customer.tbl' INTO TABLE customer FIELDS TERMINATED BY '|';

16
mysql-test/columnstore/autopilot/r/mcs4007_autopilot_dbt3_performance_queries_1g.result
View File

@ -16,7 +16,7 @@ nation CREATE TABLE `nation` (
`n_name` char(25) DEFAULT NULL,
`n_regionkey` int(11) DEFAULT NULL,
`n_comment` varchar(152) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists region;
create table region (
r_regionkey int,
@ -29,7 +29,7 @@ region CREATE TABLE `region` (
`r_regionkey` int(11) DEFAULT NULL,
`r_name` char(25) DEFAULT NULL,
`r_comment` varchar(152) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists customer;
create table customer (
c_custkey int,
@ -52,7 +52,7 @@ customer CREATE TABLE `customer` (
`c_acctbal` decimal(12,2) DEFAULT NULL,
`c_mktsegment` char(10) DEFAULT NULL,
`c_comment` varchar(117) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists orders;
create table orders (
o_orderkey int,
@ -77,7 +77,7 @@ orders CREATE TABLE `orders` (
`o_clerk` char(15) DEFAULT NULL,
`o_shippriority` int(11) DEFAULT NULL,
`o_comment` varchar(79) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists supplier;
create table supplier (
s_suppkey int,
@ -98,7 +98,7 @@ supplier CREATE TABLE `supplier` (
`s_phone` char(15) DEFAULT NULL,
`s_acctbal` decimal(12,2) DEFAULT NULL,
`s_comment` varchar(101) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists partsupp;
create table partsupp (
ps_partkey int,
@ -115,7 +115,7 @@ partsupp CREATE TABLE `partsupp` (
`ps_availqty` int(11) DEFAULT NULL,
`ps_supplycost` decimal(12,2) DEFAULT NULL,
`ps_comment` varchar(199) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists part;
create table part (
p_partkey int,
@ -140,7 +140,7 @@ part CREATE TABLE `part` (
`p_container` char(10) DEFAULT NULL,
`p_retailprice` decimal(12,2) DEFAULT NULL,
`p_comment` varchar(23) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists lineitem;
create table lineitem (
l_orderkey int,
@ -179,7 +179,7 @@ lineitem CREATE TABLE `lineitem` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
LOAD DATA INFILE '/data/qa/source/dbt3/1g/nation.tbl' INTO TABLE nation FIELDS TERMINATED BY '|';
LOAD DATA INFILE '/data/qa/source/dbt3/1g/region.tbl' INTO TABLE region FIELDS TERMINATED BY '|';
LOAD DATA INFILE '/data/qa/source/dbt3/1g/customer.tbl' INTO TABLE customer FIELDS TERMINATED BY '|';

6
mysql-test/columnstore/autopilot/r/mcs4008_autopilot_sanity_test.result
View File

@ -25,7 +25,7 @@ orders CREATE TABLE `orders` (
`o_clerk` char(15) DEFAULT NULL,
`o_shippriority` int(11) DEFAULT NULL,
`o_comment` varchar(79) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table if exists lineitem;
create table lineitem (
l_orderkey int,
@ -64,14 +64,14 @@ lineitem CREATE TABLE `lineitem` (
`l_shipinstruct` char(25) DEFAULT NULL,
`l_shipmode` char(10) DEFAULT NULL,
`l_comment` varchar(44) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
create table if not exists quicktest (c1 int, c2 char(15)) engine=columnstore;
SHOW CREATE TABLE quicktest;
Table Create Table
quicktest CREATE TABLE `quicktest` (
`c1` int(11) DEFAULT NULL,
`c2` char(15) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
insert into quicktest values (1,'Hello');
insert into quicktest values (2,'world');
select * from quicktest;

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

@ -18,7 +18,7 @@ nation CREATE TABLE `nation` (
`n_name` char(25) DEFAULT NULL,
`n_regionkey` int(11) DEFAULT NULL,
`n_comment` varchar(152) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
LOAD DATA INFILE '/data/qa/source/dbt3/1m/nation.tbl' INTO TABLE nation FIELDS TERMINATED BY '|';
create table region (
r_regionkey int,
@ -31,7 +31,7 @@ region CREATE TABLE `region` (
`r_regionkey` int(11) DEFAULT NULL,
`r_name` char(25) DEFAULT NULL,
`r_comment` varchar(152) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
insert into region values (1, 'AMERICA', 'hs use ironic, even requests. s');
insert into region values (2, 'ASIA', 'ges. thinly even pinto beans ca');
select count(*) from nation n, region r where n.n_regionkey = r.r_regionkey and r.r_regionkey = 2;