Skip to content

Reduce conflict of sql_parser.cup#4177

Merged
morningman merged 3 commits intoapache:masterfrom
yangzhg:reduce_conflict
Jul 28, 2020
Merged

Reduce conflict of sql_parser.cup#4177
morningman merged 3 commits intoapache:masterfrom
yangzhg:reduce_conflict

Conversation

@yangzhg
Copy link
Member

@yangzhg yangzhg commented Jul 24, 2020

Proposed changes

Fix the Shift/Reduce conflict in cup file #4176

Types of changes

What types of changes does your code introduce to Doris?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have create an issue on Doris's issues, and have described the bug/feature there in detail
  • Commit messages in my PR start with the related issues ID
  • Compiling and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • If this change need a document change, I have updated the document
  • Any dependent changes have been merged

@morningman
Copy link
Contributor

If we resolve the reduce conflict, I suggest to modify the expectedConflicts in fe/fe-core/pom.xml too.

@morningman morningman self-assigned this Jul 24, 2020
@morningman morningman added the area/sql Issues or PRs related to SQL label Jul 24, 2020
@kangkaisen
Copy link
Contributor

kangkaisen commented Jul 25, 2020

@yangzhg @morningman Hi, The sql_parser.cup file seems has conflict issue frequently. could we put a readme file or some useful link under fe/fe-core/src/main/cup/ directory? which is friendly for new contributor.

@yangzhg
Copy link
Member Author

yangzhg commented Jul 27, 2020

If we resolve the reduce conflict, I suggest to modify the expectedConflicts in fe/fe-core/pom.xml too.

done

@yangzhg
Copy link
Member Author

yangzhg commented Jul 27, 2020

@yangzhg @morningman Hi, The sql_parser.cup file seems has conflict issue frequently. could we put a readme file or some useful link under fe/fe-core/src/main/cup/ directory? which is friendly for new contributor.

@kangkaisen It is difficult to describe clearly how to write a cup file with simple sentences, but we can attach a link to the cup syntax

@kangkaisen
Copy link
Contributor

@yangzhg @morningman Hi, The sql_parser.cup file seems has conflict issue frequently. could we put a readme file or some useful link under fe/fe-core/src/main/cup/ directory? which is friendly for new contributor.

@kangkaisen It is difficult to describe clearly how to write a cup file with simple sentences, but we can attach a link to the cup syntax

OK.

Copy link
Contributor

@morningman morningman left a comment

Choose a reason for hiding this comment

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

LGTM

@morningman morningman added the approved Indicates a PR has been approved by one committer. label Jul 27, 2020
@morningman morningman merged commit 90eaa51 into apache:master Jul 28, 2020
@yangzhg yangzhg deleted the reduce_conflict branch September 14, 2020 01:47
Hastyshell pushed a commit to Hastyshell/doris that referenced this pull request Jul 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. area/sql Issues or PRs related to SQL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants