Skip to content

fix explain plan on server engine #2983

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

fix explain plan on server engine #2983

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
16 changes: 12 additions & 4 deletions enginetest/queries/queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10260,6 +10260,16 @@ from typestable`,
{false},
},
},
{
Query: "explain plan select count(*) from mytable",
Expected: []sql.Row{
{"Project"},
{" ├─ columns: [count(1)]"},
{" └─ Project"},
{" ├─ columns: [mytable.COUNT(1) as COUNT(1)]"},
{" └─ table_count(mytable) as COUNT(1)"},
},
},
{
Query: "explain select 1",
SkipServerEngine: true,
Expand All @@ -10268,8 +10278,7 @@ from typestable`,
},
},
{
Query: "explain plan select 1",
SkipServerEngine: true,
Query: "explain plan select 1",
Expected: []sql.Row{
{"Project"},
{" ├─ columns: [1]"},
Expand All @@ -10278,8 +10287,7 @@ from typestable`,
},
},
{
Query: "explain format=tree select 1",
SkipServerEngine: true,
Query: "explain format=tree select 1",
Expected: []sql.Row{
{"Project"},
{" ├─ columns: [1]"},
Expand Down
2 changes: 1 addition & 1 deletion enginetest/server_engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func (s *ServerQueryEngine) queryOrExec(ctx *sql.Context, stmt *gosql.Stmt, pars
var err error
switch parsed.(type) {
// TODO: added `FLUSH` stmt here (should be `exec`) because we don't support `FLUSH BINARY LOGS` or `FLUSH ENGINE LOGS`, so nil schema is returned.
case *sqlparser.Select, *sqlparser.SetOp, *sqlparser.Show, *sqlparser.Set, *sqlparser.Call, *sqlparser.Begin, *sqlparser.Use, *sqlparser.Load, *sqlparser.Execute, *sqlparser.Analyze, *sqlparser.Flush:
case *sqlparser.Select, *sqlparser.SetOp, *sqlparser.Show, *sqlparser.Set, *sqlparser.Call, *sqlparser.Begin, *sqlparser.Use, *sqlparser.Load, *sqlparser.Execute, *sqlparser.Analyze, *sqlparser.Flush, *sqlparser.Explain:
var rows *gosql.Rows
if stmt != nil {
rows, err = stmt.Query(args...)
Expand Down
1 change: 1 addition & 0 deletions sql/analyzer/analyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ func (a *Analyzer) Analyze(ctx *sql.Context, node sql.Node, scope *plan.Scope, q
switch n := node.(type) {
case *plan.DescribeQuery:
child, _, err := a.analyzeWithSelector(ctx, n.Query(), scope, SelectAllBatches, DefaultRuleSelector, qFlags)
qFlags.Unset(sql.QFlagMax1Row) // the rule replaceCountStar can set this incorrectly for queries containing count(*).
return n.WithQuery(child), err
}
node, _, err := a.analyzeWithSelector(ctx, node, scope, SelectAllBatches, DefaultRuleSelector, qFlags)
Expand Down
Loading