Skip to content

Fix subquery merging regression introduced in #11379 (#18260) #156

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
arthurschreiber merged 1 commit into from
May 12, 2025
Merged

Fix subquery merging regression introduced in #11379 (#18260) #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions go/vt/vtgate/planbuilder/operators/route_planning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@ func canMergeOnFilter(ctx *plancontext.PlanningContext, a, b *Route, predicate s
if comparison.Operator != sqlparser.EqualOp {
return false
}
left := comparison.Left
right := comparison.Right
left := getColName(comparison.Left)
right := getColName(comparison.Right)

lVindex := findColumnVindex(ctx, a, left)
if lVindex == nil {
Expand Down
153 changes: 36 additions & 117 deletions go/vt/vtgate/planbuilder/testdata/select_cases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3846,46 +3846,19 @@
"QueryType": "SELECT",
"Original": "SELECT music.id FROM music WHERE music.id IN (SELECT MAX(music.id) FROM music WHERE music.user_id IN (5, 6) GROUP BY music.user_id)",
"Instructions": {
"OperatorType": "UncorrelatedSubquery",
"Variant": "PulloutIn",
"PulloutVars": [
"__sq_has_values",
"__sq1"
"OperatorType": "Route",
"Variant": "IN",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select music.id from music where 1 != 1",
"Query": "select music.id from music where music.id in (select max(music.id) from music where music.user_id in (5, 6) group by music.user_id)",
"Table": "music",
"Values": [
"(5, 6)"
],
"Inputs": [
{
"InputName": "SubQuery",
"OperatorType": "Route",
"Variant": "IN",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select max(music.id) from music where 1 != 1 group by music.user_id",
"Query": "select max(music.id) from music where music.user_id in ::__vals group by music.user_id",
"Table": "music",
"Values": [
"(5, 6)"
],
"Vindex": "user_index"
},
{
"InputName": "Outer",
"OperatorType": "Route",
"Variant": "IN",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select music.id from music where 1 != 1",
"Query": "select music.id from music where :__sq_has_values and music.id in ::__vals",
"Table": "music",
"Values": [
"::__sq1"
],
"Vindex": "music_user_map"
}
]
"Vindex": "user_index"
},
"TablesUsed": [
"user.music"
Expand Down Expand Up @@ -3959,46 +3932,19 @@
"QueryType": "SELECT",
"Original": "SELECT music.id FROM music WHERE music.id IN (SELECT MAX(music.id) FROM music WHERE music.user_id = 5)",
"Instructions": {
"OperatorType": "UncorrelatedSubquery",
"Variant": "PulloutIn",
"PulloutVars": [
"__sq_has_values",
"__sq1"
"OperatorType": "Route",
"Variant": "EqualUnique",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select music.id from music where 1 != 1",
"Query": "select music.id from music where music.id in (select max(music.id) from music where music.user_id = 5)",
"Table": "music",
"Values": [
"5"
],
"Inputs": [
{
"InputName": "SubQuery",
"OperatorType": "Route",
"Variant": "EqualUnique",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select max(music.id) from music where 1 != 1",
"Query": "select max(music.id) from music where music.user_id = 5",
"Table": "music",
"Values": [
"5"
],
"Vindex": "user_index"
},
{
"InputName": "Outer",
"OperatorType": "Route",
"Variant": "IN",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select music.id from music where 1 != 1",
"Query": "select music.id from music where :__sq_has_values and music.id in ::__vals",
"Table": "music",
"Values": [
"::__sq1"
],
"Vindex": "music_user_map"
}
]
"Vindex": "user_index"
},
"TablesUsed": [
"user.music"
Expand All @@ -4012,46 +3958,19 @@
"QueryType": "SELECT",
"Original": "SELECT music.id FROM music WHERE music.id IN (SELECT MAX(music.id) FROM music WHERE music.user_id = 5 LIMIT 10)",
"Instructions": {
"OperatorType": "UncorrelatedSubquery",
"Variant": "PulloutIn",
"PulloutVars": [
"__sq_has_values",
"__sq1"
"OperatorType": "Route",
"Variant": "EqualUnique",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select music.id from music where 1 != 1",
"Query": "select music.id from music where music.id in (select max(music.id) from music where music.user_id = 5 limit 10)",
"Table": "music",
"Values": [
"5"
],
"Inputs": [
{
"InputName": "SubQuery",
"OperatorType": "Route",
"Variant": "EqualUnique",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select max(music.id) from music where 1 != 1",
"Query": "select max(music.id) from music where music.user_id = 5 limit 10",
"Table": "music",
"Values": [
"5"
],
"Vindex": "user_index"
},
{
"InputName": "Outer",
"OperatorType": "Route",
"Variant": "IN",
"Keyspace": {
"Name": "user",
"Sharded": true
},
"FieldQuery": "select music.id from music where 1 != 1",
"Query": "select music.id from music where :__sq_has_values and music.id in ::__vals",
"Table": "music",
"Values": [
"::__sq1"
],
"Vindex": "music_user_map"
}
]
"Vindex": "user_index"
},
"TablesUsed": [
"user.music"
Expand Down
Loading