Skip to content

Commit 13a039b

Browse files
0xPoe0xPoe
committed
planner: correct the vector index tests (pingcap#58039)
ref pingcap#57871
1 parent 3ac4b68 commit 13a039b

File tree

2 files changed

+53
-52
lines changed

2 files changed

+53
-52
lines changed

‎pkg/planner/core/casetest/vectorsearch/testdata/ann_index_suite_out.json

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,60 @@
55
{
66
"SQL": "explain format = 'brief' select * from t1;",
77
"Plan": [
8-
"TableReader 10000.00 root MppVersion: 2, data:ExchangeSender",
9-
"└─ExchangeSender 10000.00 mpp[tiflash] ExchangeType: PassThrough",
10-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
8+
"TableReader 49152.00 root MppVersion: 2, data:ExchangeSender",
9+
"└─ExchangeSender 49152.00 mpp[tiflash] ExchangeType: PassThrough",
10+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
1111
],
1212
"Warn": null
1313
},
1414
{
1515
"SQL": "explain format = 'brief' select * from t1 where a<1;",
1616
"Plan": [
17-
"TableReader 3323.33 root MppVersion: 2, data:ExchangeSender",
18-
"└─ExchangeSender 3323.33 mpp[tiflash] ExchangeType: PassThrough",
19-
" └─Selection 3323.33 mpp[tiflash] lt(test.t1.a, 1)",
20-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 pushed down filter:empty, keep order:false, stats:pseudo"
17+
"TableReader 16334.85 root MppVersion: 2, data:ExchangeSender",
18+
"└─ExchangeSender 16334.85 mpp[tiflash] ExchangeType: PassThrough",
19+
" └─TableFullScan 16334.85 mpp[tiflash] table:t1 pushed down filter:lt(test.t1.a, 1), keep order:false, stats:pseudo"
2120
],
2221
"Warn": null
2322
},
2423
{
2524
"SQL": "explain format = 'brief' select * from t1 where vec = '[1,1,1]'",
2625
"Plan": [
27-
"TableReader 10.00 root MppVersion: 2, data:ExchangeSender",
28-
"└─ExchangeSender 10.00 mpp[tiflash] ExchangeType: PassThrough",
29-
" └─TableFullScan 10.00 mpp[tiflash] table:t1 pushed down filter:eq(test.t1.vec, [1,1,1]), keep order:false, stats:pseudo"
26+
"TableReader 49.15 root MppVersion: 2, data:ExchangeSender",
27+
"└─ExchangeSender 49.15 mpp[tiflash] ExchangeType: PassThrough",
28+
" └─TableFullScan 49.15 mpp[tiflash] table:t1 pushed down filter:eq(test.t1.vec, [1,1,1]), keep order:false, stats:pseudo"
3029
],
3130
"Warn": null
3231
},
3332
{
3433
"SQL": "explain format = 'brief' select * from t1 where vec_cosine_distance(vec, '[1,1,1]') < 0.1",
3534
"Plan": [
36-
"TableReader 8000.00 root MppVersion: 2, data:ExchangeSender",
37-
"└─ExchangeSender 8000.00 mpp[tiflash] ExchangeType: PassThrough",
38-
" └─Selection 8000.00 mpp[tiflash] lt(vec_cosine_distance(test.t1.vec, [1,1,1]), 0.1)",
39-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 pushed down filter:empty, keep order:false, stats:pseudo"
35+
"TableReader 39321.60 root MppVersion: 2, data:ExchangeSender",
36+
"└─ExchangeSender 39321.60 mpp[tiflash] ExchangeType: PassThrough",
37+
" └─Selection 39321.60 mpp[tiflash] lt(vec_cosine_distance(test.t1.vec, [1,1,1]), 0.1)",
38+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 pushed down filter:empty, keep order:false, stats:pseudo"
4039
],
4140
"Warn": null
4241
},
4342
{
4443
"SQL": "explain format = 'brief' select vec_cosine_distance(vec, '[1,1,1]') as dis from t1 having dis < 0.1",
4544
"Plan": [
46-
"TableReader 8000.00 root MppVersion: 2, data:ExchangeSender",
47-
"└─ExchangeSender 8000.00 mpp[tiflash] ExchangeType: PassThrough",
48-
" └─Projection 8000.00 mpp[tiflash] vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
49-
" └─Selection 8000.00 mpp[tiflash] lt(vec_cosine_distance(test.t1.vec, [1,1,1]), 0.1)",
50-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 pushed down filter:empty, keep order:false, stats:pseudo"
45+
"TableReader 39321.60 root MppVersion: 2, data:ExchangeSender",
46+
"└─ExchangeSender 39321.60 mpp[tiflash] ExchangeType: PassThrough",
47+
" └─Projection 39321.60 mpp[tiflash] vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
48+
" └─Selection 39321.60 mpp[tiflash] lt(vec_cosine_distance(test.t1.vec, [1,1,1]), 0.1)",
49+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 pushed down filter:empty, keep order:false, stats:pseudo"
5150
],
5251
"Warn": null
5352
},
5453
{
5554
"SQL": "explain format = 'brief' select * from t1 order by vec_cosine_distance(vec, '[1,1,1]')",
5655
"Plan": [
57-
"Projection 10000.00 root test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
58-
"└─Sort 10000.00 root Column#7",
59-
" └─Projection 10000.00 root test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
60-
" └─TableReader 10000.00 root MppVersion: 2, data:ExchangeSender",
61-
" └─ExchangeSender 10000.00 mpp[tiflash] ExchangeType: PassThrough",
62-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
56+
"Projection 49152.00 root test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
57+
"└─Sort 49152.00 root Column#7",
58+
" └─Projection 49152.00 root test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
59+
" └─TableReader 49152.00 root MppVersion: 2, data:ExchangeSender",
60+
" └─ExchangeSender 49152.00 mpp[tiflash] ExchangeType: PassThrough",
61+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
6362
],
6463
"Warn": null
6564
},
@@ -103,8 +102,8 @@
103102
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
104103
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
105104
" └─TopN 1.00 mpp[tiflash] Column#7:desc, offset:0, count:1",
106-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
107-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
105+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
106+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
108107
],
109108
"Warn": null
110109
},
@@ -118,8 +117,8 @@
118117
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
119118
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
120119
" └─TopN 1.00 mpp[tiflash] Column#7:desc, offset:0, count:1",
121-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
122-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
120+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
121+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
123122
],
124123
"Warn": null
125124
},
@@ -133,8 +132,8 @@
133132
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
134133
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
135134
" └─TopN 1.00 mpp[tiflash] Column#7, offset:0, count:1",
136-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, plus(vec_cosine_distance(test.t1.vec, [1,1,1]), 1)->Column#7",
137-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
135+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, plus(vec_cosine_distance(test.t1.vec, [1,1,1]), 1)->Column#7",
136+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
138137
],
139138
"Warn": null
140139
},
@@ -148,8 +147,8 @@
148147
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
149148
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
150149
" └─TopN 1.00 mpp[tiflash] Column#7, test.t1.vec, offset:0, count:1",
151-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
152-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
150+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
151+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
153152
],
154153
"Warn": null
155154
},
@@ -163,8 +162,8 @@
163162
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
164163
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
165164
" └─TopN 1.00 mpp[tiflash] Column#7, offset:0, count:1",
166-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l2_distance(test.t1.vec, [1,1,1])->Column#7",
167-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
165+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l2_distance(test.t1.vec, [1,1,1])->Column#7",
166+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
168167
],
169168
"Warn": null
170169
},
@@ -178,8 +177,8 @@
178177
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
179178
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
180179
" └─TopN 1.00 mpp[tiflash] Column#7, offset:0, count:1",
181-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l1_distance(test.t1.vec, [1,1,1])->Column#7",
182-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
180+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l1_distance(test.t1.vec, [1,1,1])->Column#7",
181+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
183182
],
184183
"Warn": null
185184
},
@@ -193,8 +192,8 @@
193192
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
194193
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
195194
" └─TopN 1.00 mpp[tiflash] Column#7, offset:0, count:1",
196-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l2_distance(test.t1.c, [1,1,1])->Column#7",
197-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
195+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l2_distance(test.t1.c, [1,1,1])->Column#7",
196+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
198197
],
199198
"Warn": null
200199
},
@@ -208,8 +207,8 @@
208207
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
209208
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
210209
" └─TopN 1.00 mpp[tiflash] Column#7, offset:0, count:1",
211-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l2_distance(test.t1.d, [1,1,1])->Column#7",
212-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
210+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l2_distance(test.t1.d, [1,1,1])->Column#7",
211+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
213212
],
214213
"Warn": null
215214
},
@@ -223,8 +222,8 @@
223222
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
224223
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
225224
" └─TopN 1.00 mpp[tiflash] Column#7, offset:0, count:1",
226-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.d, [1,1,1])->Column#7",
227-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
225+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.d, [1,1,1])->Column#7",
226+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
228227
],
229228
"Warn": null
230229
},
@@ -238,19 +237,19 @@
238237
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
239238
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
240239
" └─TopN 1.00 mpp[tiflash] Column#7, offset:0, count:1",
241-
" └─Projection 10000.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l1_distance(test.t1.d, [1,1,1])->Column#7",
242-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
240+
" └─Projection 49152.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_l1_distance(test.t1.d, [1,1,1])->Column#7",
241+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
243242
],
244243
"Warn": null
245244
},
246245
{
247246
"SQL": "explain format = 'brief' select vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d",
248247
"Plan": [
249-
"Sort 10000.00 root Column#7",
250-
"└─TableReader 10000.00 root MppVersion: 2, data:ExchangeSender",
251-
" └─ExchangeSender 10000.00 mpp[tiflash] ExchangeType: PassThrough",
252-
" └─Projection 10000.00 mpp[tiflash] vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
253-
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
248+
"Sort 49152.00 root Column#7",
249+
"└─TableReader 49152.00 root MppVersion: 2, data:ExchangeSender",
250+
" └─ExchangeSender 49152.00 mpp[tiflash] ExchangeType: PassThrough",
251+
" └─Projection 49152.00 mpp[tiflash] vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
252+
" └─TableFullScan 49152.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
254253
],
255254
"Warn": null
256255
},
@@ -296,8 +295,8 @@
296295
" └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough",
297296
" └─Projection 1.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d",
298297
" └─TopN 1.00 mpp[tiflash] Column#7, offset:0, count:1",
299-
" └─Projection 10.00 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
300-
" └─TableFullScan 10.00 mpp[tiflash] table:t1 pushed down filter:eq(test.t1.a, 0), keep order:false, stats:pseudo"
298+
" └─Projection 49.15 mpp[tiflash] test.t1.vec, test.t1.a, test.t1.b, test.t1.c, test.t1.d, vec_cosine_distance(test.t1.vec, [1,1,1])->Column#7",
299+
" └─TableFullScan 49.15 mpp[tiflash] table:t1 pushed down filter:eq(test.t1.a, 0), keep order:false, stats:pseudo"
301300
],
302301
"Warn": null
303302
}

‎pkg/planner/core/casetest/vectorsearch/vector_index_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ func TestTiFlashANNIndex(t *testing.T) {
8787
}
8888
dom := domain.GetDomain(tk.Session())
8989
testkit.SetTiFlashReplica(t, dom, "test", "t1")
90+
handle := dom.StatsHandle()
91+
require.NoError(t, handle.HandleDDLEvent(<-handle.DDLEventCh()))
9092
tk.MustExec("analyze table t1")
9193

9294
tk.MustExec("set @@tidb_isolation_read_engines = 'tiflash'")

0 commit comments

Comments
 (0)