Rewrite special comment parser (#711)#810
Merged
tangenta merged 2 commits intoApr 20, 2020
Merged
Conversation
* lexer: added a function to scan version digits * lexer: removed special comment scanner Instead, simply strip off '/*!' and the pairing '*/'. Temporarily disabled handling of /*+ ... */ * lexer: support collecting the entire /*+ ... */ as a single token This new token has type `hintComment`. The actual hint will be parsed lazily. * lexer,yy_parser: move lastErrorAsWarn() from Parser into Scanner * goyacc: do not allow conflict, support changing parser type name change the "DO NOT EDIT" line to fit the Go standard * parser,hintparser: created a new parser just for parsing optimizer hints deleted all optimizer hint rules from parser.go refactor the Makefile to support building both parsers (also deleted some outdated fixup of *parser.go) * lexer: fix comment parser * codecov: don't wait for integration test before showing the coverage * lexer: fix comment parsing again * hintparser: TiDB still expects `HASH_JOIN(@qb1 foo@qb2)` to be valid :( * parser,hintparser: provide the true line/column offset in the warnings cache the hintparser in the main parser to avoid repeated allocation * lexer: delete unused sqlOffsetInComment()
Codecov Report
@@ Coverage Diff @@
## release-3.1 #810 +/- ##
===============================================
- Coverage 64.65% 64.57% -0.08%
===============================================
Files 31 33 +2
Lines 11211 11438 +227
===============================================
+ Hits 7248 7386 +138
- Misses 3552 3628 +76
- Partials 411 424 +13 |
AilinKid
reviewed
Apr 17, 2020
AilinKid
approved these changes
Apr 20, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick #711, #562 and #586.