Skip to content

Commit d278fb4

Browse files
committed
Fixed tokudb test result to make it stable (was altering between index and range)
1 parent 4a60204 commit d278fb4

File tree

2 files changed

+32
-34
lines changed

2 files changed

+32
-34
lines changed

storage/tokudb/mysql-test/tokudb/r/cluster_filter_hidden.result

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ insert into t1 values (4,40,400,4000,40000,400000);
99
insert into t1 values (5,50,500,5000,50000,500000);
1010
explain select * from t1;
1111
id select_type table type possible_keys key key_len ref rows Extra
12-
1 SIMPLE t1 index NULL b NULL NULL NULL;Using index
12+
1 SIMPLE t1 index NULL b NULL NULL NULL Using index
1313
select * from t1;
1414
a b c d e f
1515
1 10 100 1000 10000 100000
@@ -19,7 +19,7 @@ a b c d e f
1919
5 50 500 5000 50000 500000
2020
explain select * from t1 where b > 0;
2121
id select_type table type possible_keys key key_len ref rows Extra
22-
1 SIMPLE t1 index b b NULL NULL NULL;Using where; Using index
22+
1 SIMPLE t1 index b b NULL NULL NULL Using where; Using index
2323
select * from t1 where b > 0;
2424
a b c d e f
2525
1 10 100 1000 10000 100000
@@ -29,7 +29,7 @@ a b c d e f
2929
5 50 500 5000 50000 500000
3030
explain select * from t1 where d > 0;
3131
id select_type table type possible_keys key key_len ref rows Extra
32-
1 SIMPLE t1 index d d NULL NULL NULL;Using where; Using index
32+
1 SIMPLE t1 index d d NULL NULL NULL Using where; Using index
3333
select * from t1 where d > 0;
3434
a b c d e f
3535
1 10 100 1000 10000 100000
@@ -39,7 +39,7 @@ a b c d e f
3939
5 50 500 5000 50000 500000
4040
explain select a from t1 where d > 0;
4141
id select_type table type possible_keys key key_len ref rows Extra
42-
1 SIMPLE t1 index d d NULL NULL NULL;Using where; Using index
42+
1 SIMPLE t1 index d d NULL NULL NULL Using where; Using index
4343
select a from t1 where d > 0;
4444
a
4545
1
@@ -71,7 +71,7 @@ e f
7171
update t1 set a = a+1, b = b+10;
7272
explain select * from t1;
7373
id select_type table type possible_keys key key_len ref rows Extra
74-
1 SIMPLE t1 index NULL b NULL NULL NULL;Using index
74+
1 SIMPLE t1 index NULL b NULL NULL NULL Using index
7575
select * from t1;
7676
a b c d e f
7777
2 20 100 1000 10000 100000
@@ -81,7 +81,7 @@ a b c d e f
8181
6 60 500 5000 50000 500000
8282
explain select * from t1 where b > 0;
8383
id select_type table type possible_keys key key_len ref rows Extra
84-
1 SIMPLE t1 index b b NULL NULL NULL;Using where; Using index
84+
1 SIMPLE t1 index b b NULL NULL NULL Using where; Using index
8585
select * from t1 where b > 0;
8686
a b c d e f
8787
2 20 100 1000 10000 100000
@@ -91,7 +91,7 @@ a b c d e f
9191
6 60 500 5000 50000 500000
9292
explain select * from t1 where d > 0;
9393
id select_type table type possible_keys key key_len ref rows Extra
94-
1 SIMPLE t1 index d d NULL NULL NULL;Using where; Using index
94+
1 SIMPLE t1 index d d NULL NULL NULL Using where; Using index
9595
select * from t1 where d > 0;
9696
a b c d e f
9797
2 20 100 1000 10000 100000
@@ -101,7 +101,7 @@ a b c d e f
101101
6 60 500 5000 50000 500000
102102
explain select a from t1 where d > 0;
103103
id select_type table type possible_keys key key_len ref rows Extra
104-
1 SIMPLE t1 index d d NULL NULL NULL;Using where; Using index
104+
1 SIMPLE t1 index d d NULL NULL NULL Using where; Using index
105105
select a from t1 where d > 0;
106106
a
107107
2
@@ -133,28 +133,28 @@ e f
133133
delete from t1 where b > 35;
134134
explain select * from t1;
135135
id select_type table type possible_keys key key_len ref rows Extra
136-
1 SIMPLE t1 index NULL b NULL NULL NULL;Using index
136+
1 SIMPLE t1 index NULL b NULL NULL NULL Using index
137137
select * from t1;
138138
a b c d e f
139139
2 20 100 1000 10000 100000
140140
3 30 200 2000 20000 200000
141141
explain select * from t1 where b > 0;
142142
id select_type table type possible_keys key key_len ref rows Extra
143-
1 SIMPLE t1 index b b NULL NULL NULL;Using where; Using index
143+
1 SIMPLE t1 index b b NULL NULL NULL Using where; Using index
144144
select * from t1 where b > 0;
145145
a b c d e f
146146
2 20 100 1000 10000 100000
147147
3 30 200 2000 20000 200000
148148
explain select * from t1 where d > 0;
149149
id select_type table type possible_keys key key_len ref rows Extra
150-
1 SIMPLE t1 index d d NULL NULL NULL;Using where; Using index
150+
1 SIMPLE t1 index d d NULL NULL NULL Using where; Using index
151151
select * from t1 where d > 0;
152152
a b c d e f
153153
2 20 100 1000 10000 100000
154154
3 30 200 2000 20000 200000
155155
explain select a from t1 where d > 0;
156156
id select_type table type possible_keys key key_len ref rows Extra
157-
1 SIMPLE t1 index d d NULL NULL NULL;Using where; Using index
157+
1 SIMPLE t1 index d d NULL NULL NULL Using where; Using index
158158
select a from t1 where d > 0;
159159
a
160160
2
@@ -175,28 +175,28 @@ alter table t1 drop index b, drop index d;
175175
alter table t1 add key b(b) clustering=yes, add index d(d,a) clustering=yes;
176176
explain select * from t1;
177177
id select_type table type possible_keys key key_len ref rows Extra
178-
1 SIMPLE t1 index NULL b NULL NULL NULL;Using index
178+
1 SIMPLE t1 index NULL b NULL NULL NULL Using index
179179
select * from t1;
180180
a b c d e f
181181
2 20 100 1000 10000 100000
182182
3 30 200 2000 20000 200000
183183
explain select * from t1 where b > 0;
184184
id select_type table type possible_keys key key_len ref rows Extra
185-
1 SIMPLE t1indexb b NULL NULL NULL;Using where; Using index
185+
1 SIMPLE t1Xb b NULL NULL NULL Using where; Using index
186186
select * from t1 where b > 0;
187187
a b c d e f
188188
2 20 100 1000 10000 100000
189189
3 30 200 2000 20000 200000
190190
explain select * from t1 where d > 0;
191191
id select_type table type possible_keys key key_len ref rows Extra
192-
1 SIMPLE t1indexd d NULL NULL NULL;Using where; Using index
192+
1 SIMPLE t1Xd d NULL NULL NULL Using where; Using index
193193
select * from t1 where d > 0;
194194
a b c d e f
195195
2 20 100 1000 10000 100000
196196
3 30 200 2000 20000 200000
197197
explain select a from t1 where d > 0;
198198
id select_type table type possible_keys key key_len ref rows Extra
199-
1 SIMPLE t1 NULL d d NULL NULL NULL;Using where; Using index
199+
1 SIMPLE t1 NULL d d NULL NULL NULL Using where; Using index
200200
select a from t1 where d > 0;
201201
a
202202
2

storage/tokudb/mysql-test/tokudb/t/cluster_filter_hidden.test

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,59 +14,59 @@ insert into t1 values (4,40,400,4000,40000,400000);
1414
insert into t1 values (5,50,500,5000,50000,500000);
1515

1616
# ignore key_len and rows columns
17-
--replace_column 7 NULL 9 NULL;
17+
--replace_column 7 NULL 9 NULL
1818
explain select * from t1;
1919
select * from t1;
2020

21-
--replace_column 7 NULL 9 NULL;
21+
--replace_column 7 NULL 9 NULL
2222
explain select * from t1 where b > 0;
2323
select * from t1 where b > 0;
2424

25-
--replace_column 7 NULL 9 NULL;
25+
--replace_column 7 NULL 9 NULL
2626
explain select * from t1 where d > 0;
2727
select * from t1 where d > 0;
2828

29-
--replace_column 7 NULL 9 NULL;
29+
--replace_column 7 NULL 9 NULL
3030
explain select a from t1 where d > 0;
3131
select a from t1 where d > 0;
3232
select e,f from t1 where c > 0;
3333
select e,f from t1 where b > 0;
3434
select e,f from t1 where d > 0;
3535

3636
update t1 set a = a+1, b = b+10;
37-
--replace_column 7 NULL 9 NULL;
37+
--replace_column 7 NULL 9 NULL
3838
explain select * from t1;
3939
select * from t1;
4040

41-
--replace_column 7 NULL 9 NULL;
41+
--replace_column 7 NULL 9 NULL
4242
explain select * from t1 where b > 0;
4343
select * from t1 where b > 0;
4444

45-
--replace_column 7 NULL 9 NULL;
45+
--replace_column 7 NULL 9 NULL
4646
explain select * from t1 where d > 0;
4747
select * from t1 where d > 0;
4848

49-
--replace_column 7 NULL 9 NULL;
49+
--replace_column 7 NULL 9 NULL
5050
explain select a from t1 where d > 0;
5151
select a from t1 where d > 0;
5252
select e,f from t1 where c > 0;
5353
select e,f from t1 where b > 0;
5454
select e,f from t1 where d > 0;
5555

5656
delete from t1 where b > 35;
57-
--replace_column 7 NULL 9 NULL;
57+
--replace_column 7 NULL 9 NULL
5858
explain select * from t1;
5959
select * from t1;
6060

61-
--replace_column 7 NULL 9 NULL;
61+
--replace_column 7 NULL 9 NULL
6262
explain select * from t1 where b > 0;
6363
select * from t1 where b > 0;
6464

65-
--replace_column 7 NULL 9 NULL;
65+
--replace_column 7 NULL 9 NULL
6666
explain select * from t1 where d > 0;
6767
select * from t1 where d > 0;
6868

69-
--replace_column 7 NULL 9 NULL;
69+
--replace_column 7 NULL 9 NULL
7070
explain select a from t1 where d > 0;
7171
select a from t1 where d > 0;
7272
select e,f from t1 where c > 0;
@@ -78,25 +78,23 @@ alter table t1 drop index b, drop index d;
7878
alter table t1 add key b(b) clustering=yes, add index d(d,a) clustering=yes;
7979

8080

81-
--replace_column 7 NULL 9 NULL;
81+
--replace_column 7 NULL 9 NULL
8282
explain select * from t1;
8383
select * from t1;
8484

85-
--replace_column 7 NULL 9 NULL;
85+
--replace_column 4 X 7 NULL 9 NULL
8686
explain select * from t1 where b > 0;
8787
select * from t1 where b > 0;
8888

89-
--replace_column 7 NULL 9 NULL;
89+
--replace_column 4 X 7 NULL 9 NULL
9090
explain select * from t1 where d > 0;
9191
select * from t1 where d > 0;
9292

93-
--replace_column 4 NULL 7 NULL 9 NULL;
93+
--replace_column 4 NULL 7 NULL 9 NULL
9494
explain select a from t1 where d > 0;
9595
select a from t1 where d > 0;
9696
select e,f from t1 where c > 0;
9797
select e,f from t1 where b > 0;
9898
select e,f from t1 where d > 0;
9999

100-
101-
102100
DROP TABLE t1;

0 commit comments

Comments
 (0)