1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Part#3 : MCOL-4678 MTR tests fail because of /tmp and ./ with LOAD DATA

Some MTR test still failed when running without --extern

Fixing the following problems:
- Changing "--exec mariadb" to "--exect $MYSQL" to properly pass the socket
- Changing ./suite/columnstore/std_data/ to MTR_SUITE_DIR/../std_data/
- Changing "cpimport" to $MCS_CPIMPORT.
  Detecting and exporting a proper $MCS_CPIMPORT in suite.pm
This commit is contained in:
Alexander Barkov
2021-06-01 15:40:49 +04:00
parent d8607be776
commit cad1b5fbba
18 changed files with 59 additions and 39 deletions

View File

@ -2,7 +2,7 @@ DROP DATABASE IF EXISTS mcs28_db1;
CREATE DATABASE mcs28_db1;
USE mcs28_db1;
CREATE TABLE t1 (a DATE, b DATE, c DATE not null, d DATE) ENGINE=Columnstore;
LOAD DATA LOCAL infile './suite/columnstore/std_data/loaddata1.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',';;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/loaddata1.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',';;
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
Warning 1265 Data truncated for column 'c' at row 1
@ -10,7 +10,7 @@ Warning 1265 Data truncated for column 'd' at row 1
Warning 1265 Data truncated for column 'a' at row 2
Warning 1265 Data truncated for column 'b' at row 2
Warning 1265 Data truncated for column 'd' at row 2
LOAD DATA LOCAL infile './suite/columnstore/std_data/loaddata1.dat' INTO TABLE t1 FIELDS TERMINATED BY ',' IGNORE 2 LINES;;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/loaddata1.dat' INTO TABLE t1 FIELDS TERMINATED BY ',' IGNORE 2 LINES;;
SELECT * FROM t1;
a b c d
0000-00-00 NULL 0000-00-00 0000-00-00
@ -18,7 +18,7 @@ a b c d
2003-03-03 2003-03-03 2003-03-03 NULL
2003-03-03 2003-03-03 2003-03-03 NULL
TRUNCATE TABLE t1;
LOAD DATA LOCAL infile './suite/columnstore/std_data/loaddata1.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',' LINES STARTING BY ',' (b,c,d);;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/loaddata1.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',' LINES STARTING BY ',' (b,c,d);;
Warnings:
Warning 1265 Data truncated for column 'c' at row 1
Warning 1265 Data truncated for column 'd' at row 1
@ -31,7 +31,7 @@ NULL 0000-00-00 0000-00-00 0000-00-00
NULL 2003-03-03 2003-03-03 NULL
DROP TABLE t1;
CREATE TABLE t1 (a TEXT, b TEXT) ENGINE=Columnstore;
LOAD DATA LOCAL infile './suite/columnstore/std_data/loaddata2.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',' ENCLOSED BY '''';;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/loaddata2.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',' ENCLOSED BY '''';;
Warnings:
Warning 1261 Row 3 doesn't contain data for all columns
SELECT CONCAT('|',a,'|'), CONCAT('|',b,'|') FROM t1;
@ -43,7 +43,7 @@ Field 3,'Field 4|
|Field 6| | 'Field 7'|
DROP TABLE t1;
CREATE TABLE t1 (a INT, b CHAR(10)) ENGINE=Columnstore;
LOAD DATA LOCAL infile './suite/columnstore/std_data/loaddata3.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' IGNORE 1 LINES;;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/loaddata3.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' IGNORE 1 LINES;;
Warnings:
Note 1265 Data truncated for column 'a' at row 1
Note 1265 Data truncated for column 'a' at row 2
@ -60,7 +60,7 @@ a b
3 row 3
0 1234567890
TRUNCATE TABLE t1;
LOAD DATA LOCAL infile './suite/columnstore/std_data/loaddata4.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' LINES TERMINATED BY '' IGNORE 1 LINES;;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/loaddata4.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' LINES TERMINATED BY '' IGNORE 1 LINES;;
Warnings:
Note 1265 Data truncated for column 'a' at row 1
Note 1265 Data truncated for column 'a' at row 2

View File

@ -7,6 +7,9 @@ CREATE TABLE mcs51_db1.t_myisam (col1 INT, col2 INT, col3 CHAR(8)) ENGINE=MyISAM
CREATE TABLE mcs51_db2.t_mcs (col1 INT, col2 INT, col3 CHAR(8)) ENGINE=Columnstore;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/100Krows.dat' INTO TABLE mcs51_db1.t_innodb FIELDS TERMINATED BY '|';;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/100Krows.dat' INTO TABLE mcs51_db1.t_myisam FIELDS TERMINATED BY '|';;
SELECT COUNT(*) FROM mcs51_db1.t_innodb;
COUNT(*)
100001
SELECT * FROM mcs51_db2.t_mcs ORDER BY col1;
col1 col2 col3
0 10332 PhqDBpPa
@ -100014,6 +100017,9 @@ SELECT COUNT(*) FROM mcs51_db2.t_mcs;
COUNT(*)
100001
TRUNCATE mcs51_db2.t_mcs;
SELECT COUNT(*) FROM mcs51_db1.t_myisam;
COUNT(*)
100001
SELECT * FROM mcs51_db2.t_mcs ORDER BY col1;
col1 col2 col3
0 10332 PhqDBpPa

View File

@ -2,7 +2,7 @@ DROP DATABASE IF EXISTS mcs67_db;
CREATE DATABASE mcs67_db;
USE mcs67_db;
CREATE TABLE t1(col1 INT, col2 INT, col3 CHAR(8)) ENGINE=Columnstore;
LOAD DATA LOCAL infile './suite/columnstore/std_data/100Krows.dat' INTO TABLE t1 FIELDS TERMINATED BY '|';
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/100Krows.dat' INTO TABLE t1 FIELDS TERMINATED BY '|';;
SELECT COUNT(*) FROM t1;
COUNT(*)
100001

View File

@ -11,7 +11,7 @@ c_acctbal decimal(12,2),
c_mktsegment char (10),
c_comment varchar (117)
) engine=columnstore;
LOAD DATA LOCAL infile './suite/columnstore/std_data/1m_customer.tbl' INTO TABLE customer FIELDS TERMINATED BY '|';
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/1m_customer.tbl' INTO TABLE customer FIELDS TERMINATED BY '|';;
ALTER TABLE customer ADD COLUMN u_custkey INT UNSIGNED;
ALTER TABLE customer ADD COLUMN u_bigcustkey BIGINT UNSIGNED;
UPDATE customer SET u_custkey=c_custkey * c_custkey + 4294000000;

View File

@ -22,8 +22,8 @@ o_clerk char (15),
o_shippriority int,
o_comment varchar (79)
) engine=columnstore;
LOAD DATA LOCAL infile './suite/columnstore/std_data/1m_customer.tbl' INTO TABLE customer FIELDS TERMINATED BY '|';
LOAD DATA LOCAL infile './suite/columnstore/std_data/1m_orders.tbl' INTO TABLE orders FIELDS TERMINATED BY '|';
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/1m_customer.tbl' INTO TABLE customer FIELDS TERMINATED BY '|';;
LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/1m_orders.tbl' INTO TABLE orders FIELDS TERMINATED BY '|';;
alter table customer add column u_custkey int unsigned;
update customer set u_custkey=c_custkey;
alter table orders add column u_custkey int unsigned;