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

Fix deprication warnings in the MTR with select * from .. into

Browse Source
This commit is contained in:
Timofey Turenko
2025-04-03 01:20:06 +03:00
committed by Leonid Fedorov
parent 41beae9a25
commit 8c8e3ab842
12 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/columnstore/basic/r/mcol641-insert.result
View File

@ -286,9 +286,7 @@ insert_select_test1 0 0.0000000000 0.00000000000000000000000000000000000000 0 0.
insert_select_test1 NULL NULL NULL NULL NULL NULL
insert_select_test1 12345678901234567890123456789000000001 1234567890123456789012345678.0010000008 0.00001000000000000000000000000000000009 1234567890120000001 123456789.0020000009 0.0000000070000000009
insert_select_test1 -12345678901234567890123456789000000001 -1234567890123456789012345678.0010000008 -0.00001000000000000000000000000000000009 -1234567890120000001 -123456789.0020000009 -0.0000000070000000009
SELECT * FROM cs3 INTO OUTFILE '/tmp/wide_decimal_ldi.txt' FIELDS TERMINATED BY ',';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
SELECT * INTO OUTFILE '/tmp/wide_decimal_ldi.txt' FIELDS TERMINATED BY ',' FROM cs3;
DELETE FROM cs3;
LOAD DATA LOCAL INFILE '/tmp/wide_decimal_ldi.txt' INTO TABLE cs3 FIELDS TERMINATED BY ',';
SELECT "ldi_test1", d1, d2, d3, d4, d5, d6 FROM cs3;
@ -655,9 +653,7 @@ insert_select_test2 0 0.0000000000 0.00000000000000000000000000000000000000 0 0.
insert_select_test2 NULL NULL NULL NULL NULL NULL
insert_select_test2 12345678901234567890123456789000000001 1234567890123456789012345678.0010000008 0.00001000000000000000000000000000000009 1234567890120000001 123456789.0020000009 0.0000000070000000009
insert_select_test2 0 0.0000000000 0.00000000000000000000000000000000000000 0 0.0000000000 0.0000000000000000000
SELECT * FROM cs4 INTO OUTFILE '/tmp/wide_decimal_ldi.txt' FIELDS TERMINATED BY ',';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
SELECT * INTO OUTFILE '/tmp/wide_decimal_ldi.txt' FIELDS TERMINATED BY ',' FROM cs4;
DELETE FROM cs4;
LOAD DATA LOCAL INFILE '/tmp/wide_decimal_ldi.txt' INTO TABLE cs4 FIELDS TERMINATED BY ',';
SELECT "ldi_test2", d1, d2, d3, d4, d5, d6 FROM cs4;

4
mysql-test/columnstore/basic/r/mcs88_import_export_csv.result
View File

@ -11,9 +11,7 @@ LOAD DATA LOCAL INFILE 'DATADIR/mcs88_100Krows.dat' INTO TABLE t1 FIELDS TERMINA
SELECT COUNT(*) FROM t1;
COUNT(*)
100001
SELECT col1, col2, col3 FROM t1 INTO OUTFILE 'DATADIR/mcs88_100Krows.dat' FIELDS TERMINATED BY '|';;
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
SELECT col1, col2, col3 INTO OUTFILE 'DATADIR/mcs88_100Krows.dat' FIELDS TERMINATED BY '|' FROM t1;;
TRUNCATE t1;
SELECT COUNT(*) FROM t1;
COUNT(*)

4
mysql-test/columnstore/basic/t/mcol641-insert.test
View File

@ -118,7 +118,7 @@ SELECT "insert_select_test1", d1, d2, d3, d4, d5, d6 FROM cs3;
# LDI
--exec rm -f /tmp/wide_decimal_ldi.txt
SELECT * FROM cs3 INTO OUTFILE '/tmp/wide_decimal_ldi.txt' FIELDS TERMINATED BY ',';
SELECT * INTO OUTFILE '/tmp/wide_decimal_ldi.txt' FIELDS TERMINATED BY ',' FROM cs3;
DELETE FROM cs3;
LOAD DATA LOCAL INFILE '/tmp/wide_decimal_ldi.txt' INTO TABLE cs3 FIELDS TERMINATED BY ',';
SELECT "ldi_test1", d1, d2, d3, d4, d5, d6 FROM cs3;
@ -219,7 +219,7 @@ SELECT "insert_select_test2", d1, d2, d3, d4, d5, d6 FROM cs4;
# LDI
--exec rm -f /tmp/wide_decimal_ldi.txt
SELECT * FROM cs4 INTO OUTFILE '/tmp/wide_decimal_ldi.txt' FIELDS TERMINATED BY ',';
SELECT * INTO OUTFILE '/tmp/wide_decimal_ldi.txt' FIELDS TERMINATED BY ',' FROM cs4;
DELETE FROM cs4;
LOAD DATA LOCAL INFILE '/tmp/wide_decimal_ldi.txt' INTO TABLE cs4 FIELDS TERMINATED BY ',';
SELECT "ldi_test2", d1, d2, d3, d4, d5, d6 FROM cs4;

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

@ -33,7 +33,7 @@ SELECT COUNT(*) FROM t1;
# Export table to CSV
--exec rm -f $DATADIR/mcs88_100Krows.dat
--replace_result $DATADIR DATADIR
--eval SELECT col1, col2, col3 FROM t1 INTO OUTFILE '$DATADIR/mcs88_100Krows.dat' FIELDS TERMINATED BY '|';
--eval SELECT col1, col2, col3 INTO OUTFILE '$DATADIR/mcs88_100Krows.dat' FIELDS TERMINATED BY '|' FROM t1;
# Clear table data and re-import
TRUNCATE t1;

7
mysql-test/columnstore/devregression/r/mcs7058_regression_bug3262.result
View File

@ -1,11 +1,6 @@
USE tpch1;
select count(*) from nation into outfile '/tmp/natcount.tbl';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
select count(*) into outfile '/tmp/natcount.tbl' from nation;
select count(*) from nation;
count(*)
25
select count(*) from nation into outfile 'nation.out';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
select count(*) into outfile 'nation.out' from nation;

18
mysql-test/columnstore/devregression/r/mcs7130_regression_bug3935.result
View File

@ -1,24 +1,18 @@
USE tpch1;
select n_nationkey, n_name into outfile '/tmp/bug3935_outfile.txt'
FIELDS TERMINATED BY '|' LINES TERMINATED BY '/n' from nation;
select n_nationkey, n_name from nation into outfile '/tmp/bug3935_outfile.txt'
FIELDS TERMINATED BY '|' LINES TERMINATED BY '/n';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
select n_nationkey, n_name into outfile '/tmp/bug3935_outfile.txt'
FIELDS TERMINATED BY '|' LINES TERMINATED BY '/n' from nation;
select n_nationkey, n_name into outfile '/tmp/bug3935_outfile.txt'
FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '/n'
from nation;
SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name
FROM nation ORDER BY n_name DESC) INTO OUTFILE
'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
ORDER BY n_name DESC) INTO OUTFILE
'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n' FROM nation;
SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name
FROM nation ORDER BY n_name DESC) INTO OUTFILE
ORDER BY n_name DESC) INTO OUTFILE
'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
LINES TERMINATED BY '\n';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
LINES TERMINATED BY '\n' FROM nation;
SELECT *
INTO OUTFILE '/tmp/bug3935_outfile.txt'
FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'

4
mysql-test/columnstore/devregression/r/mcs7230_regression_MCOL-4000.result
View File

@ -18,9 +18,7 @@ l_shipinstruct CHAR (25),
l_shipmode CHAR (10),
l_comment VARCHAR (44)
) ENGINE=columnstore;
SELECT * FROM lineitem LIMIT 1000000 INTO OUTFILE '/tmp/mcol4000.txt' FIELDS TERMINATED BY ',' ENCLOSED BY '"';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
SELECT * INTO OUTFILE '/tmp/mcol4000.txt' FIELDS TERMINATED BY ',' ENCLOSED BY '"' FROM lineitem LIMIT 1000000;
set columnstore_use_import_for_batchinsert=ALWAYS;
START TRANSACTION;
INSERT INTO mcol4000(l_comment) VALUES ('mcol4000');

4
mysql-test/columnstore/devregression/r/mcs7231_regression_MCOL-4002.result
View File

@ -18,9 +18,7 @@ l_shipinstruct CHAR (25),
l_shipmode CHAR (10),
l_comment VARCHAR (44)
) ENGINE=columnstore;
SELECT * FROM lineitem LIMIT 100 INTO OUTFILE '/tmp/mcol4002.txt' FIELDS TERMINATED BY ',' ENCLOSED BY '"';
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
SELECT * INTO OUTFILE '/tmp/mcol4002.txt' FIELDS TERMINATED BY ',' ENCLOSED BY '"' FROM lineitem LIMIT 100;
START TRANSACTION;
INSERT INTO mcol4002(l_comment) VALUES ('mcol4002');
SELECT COUNT(*) FROM mcol4002;

6
mysql-test/columnstore/devregression/t/mcs7058_regression_bug3262.test
View File

@ -9,15 +9,11 @@
USE tpch1;
#
--exec rm -f /tmp/natcount.tbl
select count(*) from nation into outfile '/tmp/natcount.tbl';
--exec rm -f /tmp/natcount.tbl
select count(*) into outfile '/tmp/natcount.tbl' from nation;
select count(*) from nation;
--exec rm -f /var/lib/mysql/tpch1/nation.out
--exec rm -f /var/lib/mysql/tpch1c/nation.out
select count(*) from nation into outfile 'nation.out';
select count(*) into outfile 'nation.out' from nation;
--exec rm -f /var/lib/mysql/tpch1/nation.out
--exec rm -f /var/lib/mysql/tpch1c/nation.out
#

12
mysql-test/columnstore/devregression/t/mcs7130_regression_bug3935.test
View File

@ -14,8 +14,8 @@ select n_nationkey, n_name into outfile '/tmp/bug3935_outfile.txt'
FIELDS TERMINATED BY '|' LINES TERMINATED BY '/n' from nation;
--exec rm -f /tmp/bug3935_outfile.txt
select n_nationkey, n_name from nation into outfile '/tmp/bug3935_outfile.txt'
FIELDS TERMINATED BY '|' LINES TERMINATED BY '/n';
select n_nationkey, n_name into outfile '/tmp/bug3935_outfile.txt'
FIELDS TERMINATED BY '|' LINES TERMINATED BY '/n' from nation;
--exec rm -f /tmp/bug3935_outfile.txt
select n_nationkey, n_name into outfile '/tmp/bug3935_outfile.txt'
@ -24,14 +24,14 @@ from nation;
--exec rm -f /tmp/bug3935_outfile.txt
SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name
FROM nation ORDER BY n_name DESC) INTO OUTFILE
'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n';
ORDER BY n_name DESC) INTO OUTFILE
'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n' FROM nation;
--exec rm -f /tmp/bug3935_outfile.txt
SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name
FROM nation ORDER BY n_name DESC) INTO OUTFILE
ORDER BY n_name DESC) INTO OUTFILE
'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
LINES TERMINATED BY '\n';
LINES TERMINATED BY '\n' FROM nation;
--exec rm -f /tmp/bug3935_outfile.txt
SELECT *

2
mysql-test/columnstore/devregression/t/mcs7230_regression_MCOL-4000.test
View File

@ -37,7 +37,7 @@ CREATE TABLE mcol4000(
) ENGINE=columnstore;
--exec rm -f /tmp/mcol4000.txt
SELECT * FROM lineitem LIMIT 1000000 INTO OUTFILE '/tmp/mcol4000.txt' FIELDS TERMINATED BY ',' ENCLOSED BY '"';
SELECT * INTO OUTFILE '/tmp/mcol4000.txt' FIELDS TERMINATED BY ',' ENCLOSED BY '"' FROM lineitem LIMIT 1000000;
#-- In the below, we are referring to a single insert as a DML

2
mysql-test/columnstore/devregression/t/mcs7231_regression_MCOL-4002.test
View File

@ -33,7 +33,7 @@ CREATE TABLE mcol4002(
) ENGINE=columnstore;
--exec rm -f /tmp/mcol4002.txt
SELECT * FROM lineitem LIMIT 100 INTO OUTFILE '/tmp/mcol4002.txt' FIELDS TERMINATED BY ',' ENCLOSED BY '"';
SELECT * INTO OUTFILE '/tmp/mcol4002.txt' FIELDS TERMINATED BY ',' ENCLOSED BY '"' FROM lineitem LIMIT 100;
#-- In the below, we are referring to a single insert as a DML