Skip to content
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

Jump to bottom

Fix __sq_has_values1 error with PulloutSubquery #9855

Merged
merged 2 commits into from
Mar 10, 2022
Merged

Fix __sq_has_values1 error with PulloutSubquery #9855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72a3164
fix: use HasValues argument for EXISTS subquery instead of Name
frouioui Mar 9, 2022
122272b
test: addition of an end-to-end test for exists subquery
frouioui Mar 9, 2022
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
12 changes: 12 additions & 0 deletions go/test/endtoend/vtgate/queries/subquery/subquery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ func TestSubqueriesHasValues(t *testing.T) {
utils.AssertMatches(t, conn, `SELECT id2 FROM t1 WHERE id1 NOT IN (SELECT id1 FROM t1 WHERE id1 > 10) ORDER BY id2`, `[[INT64(1)] [INT64(2)] [INT64(3)] [INT64(4)] [INT64(5)] [INT64(6)]]`)
}

func TestSubqueriesExists(t *testing.T) {
defer cluster.PanicHandler(t)
ctx := context.Background()
conn, err := mysql.Connect(ctx, &vtParams)
require.NoError(t, err)
defer conn.Close()

defer utils.Exec(t, conn, `delete from t1`)
utils.Exec(t, conn, "insert into t1(id1, id2) values (0,1),(1,2),(2,3),(3,4),(4,5),(5,6)")
utils.AssertMatches(t, conn, `SELECT id2 FROM t1 WHERE EXISTS (SELECT id1 FROM t1 WHERE id1 > 0)`, `[[INT64(1)] [INT64(5)] [INT64(2)] [INT64(3)] [INT64(4)] [INT64(6)]]`)
}

func TestQueryAndSubQWithLimit(t *testing.T) {
conn, err := mysql.Connect(context.Background(), &vtParams)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion go/vt/sqlparser/ast_funcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,7 @@ func (es *ExtractedSubquery) GetHasValuesArg() string {
func (es *ExtractedSubquery) updateAlternative() {
switch original := es.Original.(type) {
case *ExistsExpr:
es.alternative = NewArgument(es.argName)
es.alternative = NewArgument(es.hasValuesArg)
case *Subquery:
es.alternative = NewArgument(es.argName)
case *ComparisonExpr:
Expand Down
4 changes: 2 additions & 2 deletions go/vt/vtgate/planbuilder/rewrite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ func (r *rewriter) rewriteExistsSubquery(cursor *sqlparser.Cursor, node *sqlpars
}

r.inSubquery++
argName := r.reservedVars.ReserveHasValuesSubQuery()
semTableSQ.SetArgName(argName)
hasValuesArg := r.reservedVars.ReserveHasValuesSubQuery()
semTableSQ.SetHasValuesArg(hasValuesArg)
cursor.Replace(semTableSQ)
return nil
}
Expand Down