Skip to content

planner: fix wrong TopN's ByItem with expression.ScalarFunction when to PushDownTopN #60822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 31 commits into from
May 7, 2025
Merged

planner: fix wrong TopN's ByItem with expression.ScalarFunction when to PushDownTopN #60822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b8c660e
planner: fix wrong schema when to PushDownPush
hawkingrei Apr 24, 2025
2311532
planner: fix wrong schema when to PushDownPush
hawkingrei Apr 24, 2025
e71c79a
planner: fix wrong schema when to PushDownPush
hawkingrei Apr 24, 2025
6b42e53
planner: fix wrong schema when to PushDownPush
hawkingrei Apr 24, 2025
b4b06f4
update
hawkingrei Apr 25, 2025
e0b4891
update
hawkingrei Apr 25, 2025
61837af
update
hawkingrei Apr 25, 2025
3ff3f89
update
hawkingrei Apr 25, 2025
2a4fc02
update
hawkingrei Apr 28, 2025
ca10012
update
hawkingrei Apr 29, 2025
4a5780a
update
hawkingrei Apr 29, 2025
98b9979
remove debug
hawkingrei Apr 29, 2025
0c01b96
remove debug
hawkingrei Apr 29, 2025
fa553fb
remove debug
hawkingrei Apr 29, 2025
fafcaa4
remove debug
hawkingrei Apr 29, 2025
80170b8
update
hawkingrei Apr 29, 2025
7437c96
update
hawkingrei May 6, 2025
bfd1c34
update
hawkingrei May 6, 2025
b2cb8b7
update
hawkingrei May 6, 2025
f702752
update
hawkingrei May 6, 2025
940c950
update
hawkingrei May 7, 2025
4b87bbf
update
hawkingrei May 7, 2025
935295e
update
hawkingrei May 7, 2025
253ff13
update
hawkingrei May 7, 2025
bca1d7a
update
hawkingrei May 7, 2025
4cbfbb9
update
hawkingrei May 7, 2025
0c2ca4f
update
hawkingrei May 7, 2025
ad9ed2c
update
hawkingrei May 7, 2025
27a2146
update
hawkingrei May 7, 2025
3cb18dd
update
hawkingrei May 7, 2025
ecb5e20
update
hawkingrei May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/executor/infoschema_reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,10 +982,10 @@ func TestInfoSchemaDDLJobs(t *testing.T) {
))

// Test explain output, since the output may change in future.
tk.MustQuery(`EXPLAIN SELECT * FROM information_schema.ddl_jobs where db_name = "test2" limit 10;`).Check(testkit.Rows(
`Limit_10 10.00 root offset:0, count:10`,
`└─Selection_11 10.00 root eq(Column#2, "test2")`,
` └─MemTableScan_12 10000.00 root table:DDL_JOBS db_name:["test2"]`,
tk.MustQuery(`EXPLAIN FORMAT='brief' SELECT * FROM information_schema.ddl_jobs where db_name = "test2" limit 10;`).Check(testkit.Rows(
`Limit 10.00 root offset:0, count:10`,
`└─Selection 10.00 root eq(Column#2, "test2")`,
` └─MemTableScan 10000.00 root table:DDL_JOBS db_name:["test2"]`,
))
}

Expand Down
92 changes: 43 additions & 49 deletions pkg/planner/core/casetest/vectorsearch/testdata/ann_index_suite_in.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,65 +48,59 @@
{
"name": "TestVectorSearchWithPKAuto",
"cases": [
"explain select id from t1",

"explain select id from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain select id from t1 order by vec_cosine_distance(vec, '[1,1,1]')",
"explain select * from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain select id, a, b from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain select a, id, b from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",

"explain select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d",
"explain select *, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain select id, vec_cosine_distance(vec, '[1,1,1]') as d, a, b from t1 order by d limit 10",
"explain select id, a, b, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10"
"explain format = 'brief' select id from t1",
"explain format = 'brief' select id from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id from t1 order by vec_cosine_distance(vec, '[1,1,1]')",
"explain format = 'brief' select * from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id, a, b from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select a, id, b from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d",
"explain format = 'brief' select *, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_cosine_distance(vec, '[1,1,1]') as d, a, b from t1 order by d limit 10",
"explain format = 'brief' select id, a, b, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10"
]
},
{
"name": "TestVectorSearchWithPKForceTiKV",
"cases": [
"explain select id from t1",

"explain select id from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain select id from t1 order by vec_cosine_distance(vec, '[1,1,1]')",
"explain select * from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain select id, a, b from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain select a, id, b from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",

"explain select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d",
"explain select *, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain select id, vec_cosine_distance(vec, '[1,1,1]') as d, a, b from t1 order by d limit 10",
"explain select id, a, b, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10"
"explain format = 'brief' select id from t1",
"explain format = 'brief' select id from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id from t1 order by vec_cosine_distance(vec, '[1,1,1]')",
"explain format = 'brief' select * from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id, a, b from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select a, id, b from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d",
"explain format = 'brief' select *, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_cosine_distance(vec, '[1,1,1]') as d, a, b from t1 order by d limit 10",
"explain format = 'brief' select id, a, b, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10"
]
},
{
"name": "TestVectorSearchHeavyFunction",
"cases": [
"explain select id from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain select id from t1 order by vec_l1_distance(vec, '[1,1,1]') limit 10",
"explain select id from t1 order by vec_l2_distance(vec, '[1,1,1]') limit 10",
"explain select id from t1 order by vec_negative_inner_product(vec, '[1,1,1]') limit 10",
"explain select id from t1 order by vec_dims(vec) limit 10",
"explain select id from t1 order by vec_l2_norm(vec) limit 10",
"explain select id from t1 order by MOD(a, 3) limit 10",

"explain select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain select id, vec_l1_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain select id, vec_l2_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain select id, vec_negative_inner_product(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain select id, vec_dims(vec) as d from t1 order by d limit 10",
"explain select id, vec_l2_norm(vec) as d from t1 order by d limit 10",
"explain select id, MOD(a, 3) as d from t1 order by d limit 10",

"explain select * from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain select * from t1 order by vec_l1_distance(vec, '[1,1,1]') limit 10",
"explain select * from t1 order by vec_l2_distance(vec, '[1,1,1]') limit 10",
"explain select * from t1 order by vec_negative_inner_product(vec, '[1,1,1]') limit 10",
"explain select * from t1 order by vec_dims(vec) limit 10",
"explain select * from t1 order by vec_l2_norm(vec) limit 10",
"explain select * from t1 order by MOD(a, 3) limit 10"
"explain format = 'brief' select id from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id from t1 order by vec_l1_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id from t1 order by vec_l2_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id from t1 order by vec_negative_inner_product(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select id from t1 order by vec_dims(vec) limit 10",
"explain format = 'brief' select id from t1 order by vec_l2_norm(vec) limit 10",
"explain format = 'brief' select id from t1 order by MOD(a, 3) limit 10",
"explain format = 'brief' select id, vec_cosine_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_l1_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_l2_distance(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_negative_inner_product(vec, '[1,1,1]') as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_dims(vec) as d from t1 order by d limit 10",
"explain format = 'brief' select id, vec_l2_norm(vec) as d from t1 order by d limit 10",
"explain format = 'brief' select id, MOD(a, 3) as d from t1 order by d limit 10",
"explain format = 'brief' select * from t1 order by vec_cosine_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select * from t1 order by vec_l1_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select * from t1 order by vec_l2_distance(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select * from t1 order by vec_negative_inner_product(vec, '[1,1,1]') limit 10",
"explain format = 'brief' select * from t1 order by vec_dims(vec) limit 10",
"explain format = 'brief' select * from t1 order by vec_l2_norm(vec) limit 10",
"explain format = 'brief' select * from t1 order by MOD(a, 3) limit 10"
]
}
]
Loading