Skip to content

Commit 2dddb4d

Browse files
author
Ole John Aske
committed
Fix the failing ndb_big_addnode.test which started failing after
increasing ThreadConfig to 4 LDM threads. Similar changes has already been performed on the similar 'non-big' ndb_addnode.test
1 parent 8d28814 commit 2dddb4d

File tree

2 files changed

+36
-35
lines changed

2 files changed

+36
-35
lines changed

mysql-test/suite/ndb_big/ndb_big_addnode.result

+33-33
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CREATE LOGFILE GROUP lg_1
1717
CREATE TABLESPACE ts_1
1818
ADD DATAFILE 'data_1.dat'
1919
USE LOGFILE GROUP lg_1
20-
INITIAL_SIZE 4M
20+
INITIAL_SIZE 16M
2121
ENGINE NDB;
2222

2323
create table t1(id int NOT NULL PRIMARY KEY, data char(8)) engine=ndb;
@@ -35,16 +35,16 @@ load data local infile 'suite/ndb/data/table_data10000.dat' into table t6 fields
3535

3636
select count(1) as t1_part_count from information_schema.partitions where table_schema='test' and table_name='t1';
3737
t1_part_count
38-
2
38+
8
3939
select count(1) as t2_part_count from information_schema.partitions where table_schema='test' and table_name='t2';
4040
t2_part_count
41-
2
41+
8
4242
select @init_t5_part_count:= count(1) as t5_part_count from information_schema.partitions where table_schema='test' and table_name='t5';
4343
t5_part_count
44-
4
44+
8
4545
select count(1) as t6_part_count from information_schema.partitions where table_schema='test' and table_name='t6';
4646
t6_part_count
47-
2
47+
8
4848

4949
connection default;
5050
explain
@@ -53,8 +53,8 @@ explain
5353
on (t6.val = t1.id)
5454
where t6.val < 25;
5555
id select_type table type possible_keys key key_len ref rows Extra
56-
1 SIMPLE t6 range val val 5 NULL 25 Parent of 2 pushed join@1; Using where with pushed condition; Using MRR
57-
1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t6.val 1 Child of 't6' in pushed join@1
56+
1 SIMPLE t6 range val val 5 NULL ### Parent of 2 pushed join@1; Using where with pushed condition; Using MRR
57+
1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t6.val ### Child of 't6' in pushed join@1
5858

5959
Starting engines...
6060
connection j1;
@@ -75,17 +75,17 @@ connection ddl;
7575

7676

7777
## Check details of t5 partitioning
78-
FragmentCount 4
79-
HashMap DEFAULT-HASHMAP-3840-4
78+
FragmentCount 8
79+
HashMap DEFAULT-HASHMAP-3840-8
8080

8181

8282
## Check details of t6 partitioning
83-
FragmentCount 2
84-
HashMap DEFAULT-HASHMAP-3840-2
85-
FragmentCount 2
86-
HashMap DEFAULT-HASHMAP-3840-2
87-
FragmentCount 2
88-
HashMap DEFAULT-HASHMAP-3840-2
83+
FragmentCount 8
84+
HashMap DEFAULT-HASHMAP-3840-8
85+
FragmentCount 8
86+
HashMap DEFAULT-HASHMAP-3840-8
87+
FragmentCount 8
88+
HashMap DEFAULT-HASHMAP-3840-8
8989

9090

9191
## Create nodegroup for "new" nodes
@@ -113,7 +113,7 @@ Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Ple
113113
alter online table t2 reorganize partition;
114114
Warnings:
115115
Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
116-
alter online table t5 max_rows=150000000;
116+
alter online table t5 max_rows=300000000;
117117
Warnings:
118118
Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
119119
alter online table t6 reorganize partition;
@@ -124,26 +124,26 @@ Warnings:
124124
Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
125125
select count(1) as t1_part_count from information_schema.partitions where table_schema='test' and table_name='t1';
126126
t1_part_count
127-
4
127+
16
128128
select count(1) as t2_part_count from information_schema.partitions where table_schema='test' and table_name='t2';
129129
t2_part_count
130-
4
130+
16
131131
select count(1) as t3_part_count from information_schema.partitions where table_schema='test' and table_name='t3';
132132
t3_part_count
133-
4
133+
16
134134
select count(1) as t4_part_count from information_schema.partitions where table_schema='test' and table_name='t4';
135135
t4_part_count
136-
4
136+
16
137137
select @reorg_t5_part_count:= count(1) as t5_part_count from information_schema.partitions where table_schema='test' and table_name='t5';
138138
t5_part_count
139-
8
139+
16
140140
select count(1) as t6_part_count from information_schema.partitions where table_schema='test' and table_name='t6';
141141
t6_part_count
142-
4
142+
16
143143

144144
## Check details of t5 partitioning
145-
FragmentCount 8
146-
HashMap DEFAULT-HASHMAP-3840-8
145+
FragmentCount 16
146+
HashMap DEFAULT-HASHMAP-3840-16
147147

148148

149149

@@ -156,17 +156,17 @@ count(0)
156156
1000
157157

158158
## Check details of t6 partitioning
159-
FragmentCount 4
160-
HashMap DEFAULT-HASHMAP-3840-4
161-
FragmentCount 4
162-
HashMap DEFAULT-HASHMAP-3840-4
163-
FragmentCount 4
164-
HashMap DEFAULT-HASHMAP-3840-4
159+
FragmentCount 16
160+
HashMap DEFAULT-HASHMAP-3840-16
161+
FragmentCount 16
162+
HashMap DEFAULT-HASHMAP-3840-16
163+
FragmentCount 16
164+
HashMap DEFAULT-HASHMAP-3840-16
165165

166166

167-
HashMap DEFAULT-HASHMAP-3840-4
168-
HashMap DEFAULT-HASHMAP-3840-4
169-
HashMap DEFAULT-HASHMAP-3840-4
167+
HashMap DEFAULT-HASHMAP-3840-16
168+
HashMap DEFAULT-HASHMAP-3840-16
169+
HashMap DEFAULT-HASHMAP-3840-16
170170

171171

172172
drop table t1,t2,t3,t4,t5,t6;

mysql-test/suite/ndb_big/ndb_big_addnode.test

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CREATE LOGFILE GROUP lg_1
2222
CREATE TABLESPACE ts_1
2323
ADD DATAFILE 'data_1.dat'
2424
USE LOGFILE GROUP lg_1
25-
INITIAL_SIZE 4M
25+
INITIAL_SIZE 16M
2626
ENGINE NDB;
2727

2828
create table t1(id int NOT NULL PRIMARY KEY, data char(8)) engine=ndb;
@@ -49,6 +49,7 @@ select count(1) as t6_part_count from information_schema.partitions where table_
4949
connection default;
5050
# connection j1;
5151

52+
--replace_column 9 ###
5253
explain
5354
select count(*)
5455
from t6 join t1
@@ -149,7 +150,7 @@ connection ddl;
149150

150151
alter online table t1 reorganize partition;
151152
alter online table t2 reorganize partition;
152-
alter online table t5 max_rows=150000000;
153+
alter online table t5 max_rows=300000000;
153154
#alter online table t6 reorganize partition;
154155
send alter online table t6 reorganize partition;
155156

0 commit comments

Comments
 (0)