branch-4.1: [fix](nereids) Make role-mapping keywords RULE/CEL/MAPPING non-reserved#64105
Merged
yiguolei merged 1 commit intoJun 5, 2026
Merged
Conversation
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Member
Author
|
run buildall |
Contributor
FE UT Coverage ReportIncrement line coverage `` 🎉 |
CalvinKirs
force-pushed
the
rolemapping-keyword-branch-4.1
branch
from
45085f5 to
425e0b0
Compare
The role-mapping DDL added the keywords RULE, CEL and MAPPING to the lexer but did not add them to the `nonReserved` rule, so they became reserved words. Common SQL that uses them as identifiers, e.g. `INSERT INTO t(..., RULE, ...)`, started failing with "mismatched input 'RULE'". Add the three keywords to `nonReserved`. They only appear in fixed, non-ambiguous positions (`RULE (`, `USING CEL`, `CREATE/DROP ROLE MAPPING`), so the grammar stays unambiguous: verified with ANTLR LL_EXACT_AMBIG_DETECTION reporting zero ambiguities and correct routing of `CREATE ROLE MAPPING ...` vs `CREATE ROLE <name>`. Add unit tests in RoleMappingParserTest and an end-to-end regression case test_role_mapping_keyword.
CalvinKirs
force-pushed
the
rolemapping-keyword-branch-4.1
branch
from
425e0b0 to
e58761a
Compare
Member
Author
|
run buildall |
Contributor
FE UT Coverage ReportIncrement line coverage `` 🎉 |
Contributor
FE Regression Coverage ReportIncrement line coverage |
2 similar comments
Contributor
FE Regression Coverage ReportIncrement line coverage |
Contributor
FE Regression Coverage ReportIncrement line coverage |
yiguolei
approved these changes
Jun 5, 2026
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.
#64104