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.

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

refactor(parser): eliminate the gap between parser v1 and v2 #17019

Merged
merged 13 commits into from
May 31, 2024

Conversation

wangrunji0408
Copy link
Contributor

Signed-off-by: Runji Wang [email protected]I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

This PR merges TokenStreamWrapper with Parser and makes all parser methods return PResult, so that they can be used with the combinators in winnow.

To improve the accuracy of cursor in error context, this PR also:

  1. inserts several checkpoints so that the parser can revert to the correct position in case of unexpected errors.
  2. removes whitespaces from tokenizer output.

With this PR, we can migrate the parser from v1 to v2 more smoothly.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Signed-off-by: Runji Wang <[email protected]>
Signed-off-by: Runji Wang <[email protected]>
Signed-off-by: Runji Wang <[email protected]>
Signed-off-by: Runji Wang <[email protected]>
Signed-off-by: Runji Wang <[email protected]>
Signed-off-by: Runji Wang <[email protected]>
@TennyZhuang TennyZhuang added this pull request to the merge queue May 31, 2024
Merged via the queue into main with commit cab8403 May 31, 2024
28 of 29 checks passed
@TennyZhuang TennyZhuang deleted the wrj/parser-v2 branch May 31, 2024 06:33
@@ -499,12 +471,10 @@ impl Parser {
/// Tries to parses a wildcard expression without any parentheses.
///
/// If wildcard is not found, go back to `index` and parse an expression.
Copy link
Member

Choose a reason for hiding this comment

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

Should also update the comments? Also apply to others.

alt((
preceded(
(Keyword::SYSTEM_TIME, Keyword::AS, Keyword::OF),
alt((
Copy link
Member

Choose a reason for hiding this comment

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

Should we cut error here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think so. We also need more tests to cover these cases.

Comment on lines +236 to +237
Parser::parse_object_name
.parse(parser)
Copy link
Member

Choose a reason for hiding this comment

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

This does not look that intuitive. 🤣 I guess that's because...

  • we make combinator a method instead of a bare function
  • the name starts with parse_

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. Eventually we should make these methods bare functions without the parse_ prefix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants