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

ast: change the order of visiting select stmt #522

Merged
merged 4 commits into from
Aug 28, 2019
Merged

ast: change the order of visiting select stmt #522

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3de13c1
ast: change the order of visiting select stmt
alivxxx Aug 23, 2019
52dcfa0
address comments
alivxxx Aug 26, 2019
e142743
Revert "address comments"
alivxxx Aug 28, 2019
2bf9ea0
Merge branch 'master' into visit-order
alivxxx Aug 28, 2019
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
18 changes: 10 additions & 8 deletions ast/dml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,8 @@ type SelectStmt struct {
IsAfterUnionDistinct bool
// IsInBraces indicates whether it's a stmt in brace.
IsInBraces bool
// QueryBlockOffset indicates the order of this SelectStmt if counted from left to right in the sql text.
QueryBlockOffset int
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where would this field be set?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In TiDB, see https://github.com/pingcap/tidb/pull/11861/files#diff-59f10b93675b42905c972e190d2f059dR45

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks pretty weird that the values is set from another repo, can we set it during the induction of parser?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that there is no way to set it correctly here, since the subpart of select stmt will get the offset first. I don't find good ways to set it correctly here.

alivxxx marked this conversation as resolved.
Show resolved Hide resolved
}

// Restore implements Node interface.
Expand Down Expand Up @@ -906,6 +908,14 @@ func (n *SelectStmt) Accept(v Visitor) (Node, bool) {
n.TableHints = newHints
}

if n.Fields != nil {
node, ok := n.Fields.Accept(v)
if !ok {
return n, false
}
n.Fields = node.(*FieldList)
}

if n.From != nil {
node, ok := n.From.Accept(v)
if !ok {
Expand All @@ -922,14 +932,6 @@ func (n *SelectStmt) Accept(v Visitor) (Node, bool) {
n.Where = node.(ExprNode)
}

if n.Fields != nil {
node, ok := n.Fields.Accept(v)
if !ok {
return n, false
}
n.Fields = node.(*FieldList)
}

if n.GroupBy != nil {
node, ok := n.GroupBy.Accept(v)
if !ok {
Expand Down