Skip to content

Commit 475dade

Browse files
mariadb-AlekseiBukhalovmariadb-AlekseiBukhalov
committed
disable some of query accelerator tests due to bug MCOL-6238
1 parent db7a0ad commit 475dade

File tree

2 files changed

+97
-118
lines changed

2 files changed

+97
-118
lines changed

‎mysql-test/columnstore/future/query_accelerator.result‎

Lines changed: 89 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,26 @@
11
DROP DATABASE IF EXISTS tpchqa;
22
CREATE DATABASE tpchqa;
33
USE tpchqa;
4-
SELECT calsettrace(1);
5-
calsettrace(1)
6-
0
7-
drop table if exists region;
84
create table region (
95
r_regionkey int PRIMARY KEY,
106
r_name char (25),
117
r_comment varchar (152)
12-
);
13-
SHOW CREATE TABLE region;
14-
drop table if exists nation;
8+
) ENGINE=InnoDB;
159
create table nation (
1610
n_nationkey int PRIMARY KEY,
1711
n_name char (25),
1812
n_regionkey int,
19-
n_comment varchar (152),
20-
FOREIGN KEY (n_regionkey) REFERENCES region(r_regionkey)
21-
);
22-
SHOW CREATE TABLE nation;
23-
drop table if exists supplier;
13+
n_comment varchar (152)
14+
) ENGINE=InnoDB;
2415
create table supplier (
2516
s_suppkey int PRIMARY KEY,
2617
s_name char (25),
2718
s_address varchar (40),
2819
s_nationkey int,
2920
s_phone char (15),
3021
s_acctbal decimal(15,2),
31-
s_comment varchar (101),
32-
FOREIGN KEY (s_nationkey) REFERENCES nation(n_nationkey)
33-
);
34-
SHOW CREATE TABLE supplier;
35-
drop table if exists customer;
22+
s_comment varchar (101)
23+
) ENGINE=InnoDB;
3624
create table customer (
3725
c_custkey int PRIMARY KEY,
3826
c_name varchar (25),
@@ -41,11 +29,8 @@ c_nationkey int,
4129
c_phone char (15),
4230
c_acctbal decimal(15,2),
4331
c_mktsegment char (10),
44-
c_comment varchar (117),
45-
FOREIGN KEY (c_nationkey) REFERENCES nation(n_nationkey)
46-
);
47-
SHOW CREATE TABLE customer;
48-
drop table if exists part;
32+
c_comment varchar (117)
33+
) ENGINE=InnoDB;
4934
create table part (
5035
p_partkey int PRIMARY KEY,
5136
p_name varchar (55),
@@ -56,21 +41,15 @@ p_size int,
5641
p_container char (10),
5742
p_retailprice decimal(15,2),
5843
p_comment varchar (23)
59-
);
60-
SHOW CREATE TABLE part;
61-
drop table if exists partsupp;
44+
) ENGINE=InnoDB;
6245
create table partsupp (
6346
ps_partkey int,
6447
ps_suppkey int,
6548
ps_availqty int,
6649
ps_supplycost decimal(15,2),
6750
ps_comment varchar (199),
68-
PRIMARY KEY (ps_partkey, ps_suppkey),
69-
FOREIGN KEY (ps_partkey) REFERENCES part(p_partkey),
70-
FOREIGN KEY (ps_suppkey) REFERENCES supplier(s_suppkey)
71-
);
72-
SHOW CREATE TABLE partsupp;
73-
drop table if exists orders;
51+
PRIMARY KEY (ps_partkey, ps_suppkey)
52+
) ENGINE=InnoDB;
7453
create table orders (
7554
o_orderkey int PRIMARY KEY,
7655
o_custkey int,
@@ -80,11 +59,8 @@ o_orderdate date,
8059
o_orderpriority char (15),
8160
o_clerk char (15),
8261
o_shippriority int,
83-
o_comment varchar (79),
84-
FOREIGN KEY (o_custkey) REFERENCES customer(c_custkey)
85-
);
86-
SHOW CREATE TABLE orders;
87-
drop table if exists lineitem;
62+
o_comment varchar (79)
63+
) ENGINE=InnoDB;
8864
create table lineitem (
8965
l_orderkey int,
9066
l_partkey int,
@@ -102,53 +78,38 @@ l_receiptdate date,
10278
l_shipinstruct char (25),
10379
l_shipmode char (10),
10480
l_comment varchar (44),
105-
PRIMARY KEY (l_orderkey, l_linenumber),
106-
FOREIGN KEY (l_orderkey) REFERENCES orders(o_orderkey),
107-
FOREIGN KEY (l_partkey) REFERENCES part(p_partkey),
108-
FOREIGN KEY (l_suppkey) REFERENCES supplier(s_suppkey)
109-
);
110-
SHOW CREATE TABLE lineitem;
81+
PRIMARY KEY (l_orderkey, l_linenumber)
82+
) ENGINE=InnoDB;
11183
ALTER TABLE partsupp ADD INDEX I1 (PS_PARTKEY, PS_SUPPKEY);
112-
ALTER TABLE lineitem ADD COLUMN `recdate_gt_commitdate` tinyint(4) NOT NULL DEFAULT 0;
113-
UPDATE lineitem SET recdate_gt_commitdate = 1 WHERE l_receiptdate > l_commitdate;
114-
ALTER TABLE lineitem ADD INDEX(`l_orderkey`, `l_suppkey`,recdate_gt_commitdate);
84+
ALTER TABLE lineitem ADD INDEX(`l_orderkey`, `l_suppkey`);
11585
ALTER TABLE orders ADD INDEX(`o_orderkey`, `o_orderstatus`);
11686
ALTER TABLE supplier ADD INDEX(s_nationkey, s_suppkey,s_name);
117-
ALTER TABLE supplier ADD FOREIGN KEY (S_NATIONKEY) REFERENCES nation(N_NATIONKEY);
118-
ALTER TABLE orders ADD FOREIGN KEY (O_CUSTKEY) REFERENCES customer(C_CUSTKEY);
119-
ALTER TABLE lineitem ADD FOREIGN KEY (L_ORDERKEY) REFERENCES orders(O_ORDERKEY);
120-
ALTER TABLE lineitem ADD FOREIGN KEY (L_PARTKEY) REFERENCES part(P_PARTKEY);
121-
ALTER TABLE lineitem ADD FOREIGN KEY (L_SUPPKEY) REFERENCES supplier(S_SUPPKEY);
122-
ALTER table nation ADD FOREIGN KEY (N_REGIONKEY) REFERENCES region(R_REGIONKEY);
123-
ALTER TABLE partsupp ADD FOREIGN KEY (PS_PARTKEY) REFERENCES part(P_PARTKEY);
124-
ALTER TABLE partsupp ADD FOREIGN KEY (PS_SUPPKEY) REFERENCES supplier(S_SUPPKEY);
125-
ALTER TABLE customer ADD FOREIGN KEY (C_NATIONKEY) REFERENCES nation(N_NATIONKEY);
126-
SET histogram_size=40;
87+
SET histogram_size=10;
12788
ANALYZE TABLE lineitem PERSISTENT FOR COLUMNS(l_orderkey) INDEXES();
12889
Table Op Msg_type Msg_text
12990
tpchqa.lineitem analyze status Engine-independent statistics collected
130-
tpchqa.lineitem analyze status Table is already up to date
91+
tpchqa.lineitem analyze status OK
13192
SET histogram_size=3;
13293
ANALYZE TABLE partsupp PERSISTENT FOR COLUMNS(ps_partkey) INDEXES();
13394
Table Op Msg_type Msg_text
13495
tpchqa.partsupp analyze status Engine-independent statistics collected
135-
tpchqa.partsupp analyze status Table is already up to date
96+
tpchqa.partsupp analyze status OK
13697
SET histogram_size=2;
13798
ANALYZE TABLE part PERSISTENT FOR COLUMNS(p_partkey) INDEXES();
13899
Table Op Msg_type Msg_text
139100
tpchqa.part analyze status Engine-independent statistics collected
140101
tpchqa.part analyze status OK
141-
SET histogram_size=6;
102+
SET histogram_size=5;
142103
ANALYZE TABLE orders PERSISTENT FOR COLUMNS(o_orderkey) INDEXES();
143104
Table Op Msg_type Msg_text
144105
tpchqa.orders analyze status Engine-independent statistics collected
145-
tpchqa.orders analyze status Table is already up to date
106+
tpchqa.orders analyze status OK
146107
SELECT count(*) from orders;
147108
count(*)
148109
150000
149110
set columnstore_unstable_optimizer=on;
150111
set optimizer_switch="index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=on,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off";
151-
SET @@columnstore_query_accel_parallel_factor=15;
112+
SET @@columnstore_query_accel_parallel_factor=5;
152113
SELECT "QUERY 1";
153114
QUERY 1
154115
QUERY 1
@@ -172,10 +133,11 @@ A F 3774200.00 5320753880.69 5054096266.6828 5256751331.449234 25.537587 36002.1
172133
N F 95257.00 133737795.84 127132372.6512 132286291.229445 25.300664 35521.326916 0.049394 3765
173134
N O 7459297.00 10512270008.90 9986238338.3847 10385578376.585467 25.545538 36000.924688 0.050096 292000
174135
R F 3785523.00 5337950526.47 5071818532.9420 5274405503.049367 25.525944 35994.029214 0.049989 148301
175-
SET @rbo_rules := mcs_get_plan('rules');
176-
SELECT @rbo_rules LIKE '%parallel_ces%' AS qa_q1_applied;
136+
SELECT mcs_get_plan('rules') LIKE '%parallel_ces%' AS qa_q1_applied;
177137
qa_q1_applied
178-
NULL
138+
1
139+
set columnstore_unstable_optimizer=off;
140+
set optimizer_switch=default;
179141
SELECT "QUERY 2";
180142
QUERY 2
181143
QUERY 2
@@ -252,6 +214,8 @@ s_acctbal s_name n_name p_partkey p_mfgr s_address s_phone s_comment
252214
-820.89 Supplier#000000409 GERMANY 2156 Manufacturer#5 LyXUYFz7aXrvy65kKAbTatGzGS,NDBcdtD 17-719-517-9836 y final, slow theodolites. furiously regular req
253215
-845.44 Supplier#000000704 ROMANIA 9926 Manufacturer#5 hQvlBqbqqnA5Dgo1BffRBX78tkkRu 29-300-896-5991 ctions. carefully sly requ
254216
-942.73 Supplier#000000563 GERMANY 5797 Manufacturer#1 Rc7U1cRUhYs03JD 17-108-537-2691 slyly furiously final decoys; silent, special realms poach f
217+
set columnstore_unstable_optimizer=on;
218+
set optimizer_switch="index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=on,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off";
255219
SELECT "QUERY 3";
256220
QUERY 3
257221
QUERY 3
@@ -280,10 +244,9 @@ l_orderkey revenue o_orderdate o_shippriority
280244
108514 314967.0754 1995-02-20 0
281245
462502 312604.5420 1995-03-08 0
282246
178727 309728.9306 1995-02-25 0
283-
SET @rbo_rules := mcs_get_plan('rules');
284-
SELECT @rbo_rules LIKE '%parallel_ces%' AS qa_q3_applied;
247+
SELECT mcs_get_plan('rules') LIKE '%parallel_ces%' AS qa_q3_applied;
285248
qa_q3_applied
286-
NULL
249+
1
287250
SELECT "QUERY 4";
288251
QUERY 4
289252
QUERY 4
@@ -649,6 +612,8 @@ c_custkey c_name revenue c_acctbal n_name c_address c_phone c_comment
649612
SELECT "QUERY 11";
650613
QUERY 11
651614
QUERY 11
615+
set columnstore_unstable_optimizer=off;
616+
set optimizer_switch=default;
652617
SELECT
653618
ps_partkey,
654619
SUM(ps_supplycost * ps_availqty) AS value
@@ -3279,6 +3244,8 @@ c_count custdist
32793244
35 5
32803245
1 2
32813246
36 1
3247+
set columnstore_unstable_optimizer=on;
3248+
set optimizer_switch="index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=on,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off";
32823249
SELECT "QUERY 14" ;
32833250
QUERY 14
32843251
QUERY 14
@@ -3317,6 +3284,8 @@ FROM revenue0
33173284
ORDER BY s_suppkey;
33183285
s_suppkey s_name s_address s_phone total_revenue
33193286
677 Supplier#000000677 8mhrffG7D2WJBSQbOGstQ 23-290-639-3315 1614410.2928
3287+
set columnstore_unstable_optimizer=off;
3288+
set optimizer_switch=default;
33203289
SELECT "QUERY 16";
33213290
QUERY 16
33223291
QUERY 16
@@ -6100,6 +6069,8 @@ Brand#22 PROMO BURNISHED COPPER 14 3
61006069
Brand#43 STANDARD BRUSHED BRASS 23 3
61016070
Brand#44 MEDIUM ANODIZED NICKEL 9 3
61026071
Brand#53 MEDIUM BURNISHED BRASS 49 3
6072+
set columnstore_unstable_optimizer=on;
6073+
set optimizer_switch="index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=on,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off";
61036074
SELECT "QUERY 17";
61046075
QUERY 17
61056076
QUERY 17
@@ -6116,6 +6087,8 @@ WHERE l_partkey = p_partkey
61166087
);
61176088
avg_yearly
61186089
23512.752857
6090+
set columnstore_unstable_optimizer=off;
6091+
set optimizer_switch=default;
61196092
SELECT "QUERY 18";
61206093
QUERY 18
61216094
QUERY 18
@@ -6143,6 +6116,8 @@ Customer#000006655 6655 29158 1995-10-21 452805.02 305.00
61436116
Customer#000014110 14110 565574 1995-09-24 425099.85 301.00
61446117
Customer#000001775 1775 6882 1997-04-09 408368.10 303.00
61456118
Customer#000011459 11459 551136 1993-05-19 386812.74 308.00
6119+
set columnstore_unstable_optimizer=on;
6120+
set optimizer_switch="index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=on,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off";
61466121
SELECT "QUERY 19";
61476122
QUERY 19
61486123
QUERY 19
@@ -6271,53 +6246,53 @@ ORDER BY
62716246
numwait DESC,
62726247
s_name;
62736248
s_name numwait
6274-
Supplier#000000445 16
6275-
Supplier#000000825 16
6276-
Supplier#000000709 15
6277-
Supplier#000000762 15
6278-
Supplier#000000357 14
6279-
Supplier#000000399 14
6280-
Supplier#000000496 14
6281-
Supplier#000000977 13
6282-
Supplier#000000144 12
6283-
Supplier#000000188 12
6284-
Supplier#000000415 12
6285-
Supplier#000000472 12
6286-
Supplier#000000633 12
6287-
Supplier#000000708 12
6288-
Supplier#000000889 12
6289-
Supplier#000000380 11
6290-
Supplier#000000602 11
6291-
Supplier#000000659 11
6292-
Supplier#000000821 11
6293-
Supplier#000000929 11
6294-
Supplier#000000262 10
6295-
Supplier#000000460 10
6296-
Supplier#000000486 10
6297-
Supplier#000000669 10
6298-
Supplier#000000718 10
6299-
Supplier#000000778 10
6300-
Supplier#000000167 9
6301-
Supplier#000000578 9
6302-
Supplier#000000673 9
6303-
Supplier#000000687 9
6304-
Supplier#000000074 8
6305-
Supplier#000000565 8
6306-
Supplier#000000648 8
6307-
Supplier#000000918 8
6308-
Supplier#000000427 7
6309-
Supplier#000000503 7
6310-
Supplier#000000610 7
6311-
Supplier#000000670 7
6312-
Supplier#000000811 7
6313-
Supplier#000000114 6
6314-
Supplier#000000379 6
6315-
Supplier#000000436 6
6316-
Supplier#000000500 6
6317-
Supplier#000000660 6
6318-
Supplier#000000788 6
6319-
Supplier#000000846 6
6320-
Supplier#000000920 4
6249+
Supplier#000000445 80
6250+
Supplier#000000825 80
6251+
Supplier#000000709 75
6252+
Supplier#000000762 75
6253+
Supplier#000000357 70
6254+
Supplier#000000399 70
6255+
Supplier#000000496 70
6256+
Supplier#000000977 65
6257+
Supplier#000000144 60
6258+
Supplier#000000188 60
6259+
Supplier#000000415 60
6260+
Supplier#000000472 60
6261+
Supplier#000000633 60
6262+
Supplier#000000708 60
6263+
Supplier#000000889 60
6264+
Supplier#000000380 55
6265+
Supplier#000000602 55
6266+
Supplier#000000659 55
6267+
Supplier#000000821 55
6268+
Supplier#000000929 55
6269+
Supplier#000000262 50
6270+
Supplier#000000460 50
6271+
Supplier#000000486 50
6272+
Supplier#000000669 50
6273+
Supplier#000000718 50
6274+
Supplier#000000778 50
6275+
Supplier#000000167 45
6276+
Supplier#000000578 45
6277+
Supplier#000000673 45
6278+
Supplier#000000687 45
6279+
Supplier#000000074 40
6280+
Supplier#000000565 40
6281+
Supplier#000000648 40
6282+
Supplier#000000918 40
6283+
Supplier#000000427 35
6284+
Supplier#000000503 35
6285+
Supplier#000000610 35
6286+
Supplier#000000670 35
6287+
Supplier#000000811 35
6288+
Supplier#000000114 30
6289+
Supplier#000000379 30
6290+
Supplier#000000436 30
6291+
Supplier#000000500 30
6292+
Supplier#000000660 30
6293+
Supplier#000000788 30
6294+
Supplier#000000846 30
6295+
Supplier#000000920 20
63216296
SELECT "QUERY 22";
63226297
QUERY 22
63236298
QUERY 22
@@ -6366,12 +6341,8 @@ cntrycode numcust totacctbal
63666341
29 85 632693.46
63676342
30 87 646748.02
63686343
31 87 647372.50
6369-
SET @rbo_rules := mcs_get_plan('rules');
6370-
SELECT @rbo_rules LIKE '%parallel_ces%' AS qa_q22_applied;
6344+
SELECT mcs_get_plan('rules') LIKE '%parallel_ces%' AS qa_q22_applied;
63716345
qa_q22_applied
6372-
NULL
6373-
SELECT calsettrace(0);
6374-
calsettrace(0)
63756346
1
63766347
DROP DATABASE tpchqa;
63776348
set columnstore_unstable_optimizer=off;

0 commit comments

Comments
 (0)