[fix](nereids) Make role-mapping keywords RULE/CEL/MAPPING non-reserved#64104
Merged
Conversation
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Member
Author
|
run buildall |
morrySnow
previously approved these changes
Jun 4, 2026
github-actions
Bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
Contributor
|
PR approved by anyone and no changes requested. |
CalvinKirs
force-pushed
the
rolemapping-keyword
branch
from
a0648ba to
5e04d29
Compare
CalvinKirs
requested review from
924060929,
englefly and
starocean999
as code owners
github-actions
Bot
removed
the
approved
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
from
5e04d29 to
808ef4a
Compare
Member
Author
|
run buildall |
Contributor
FE UT Coverage ReportIncrement line coverage `` 🎉 |
Contributor
FE Regression Coverage ReportIncrement line coverage |
Contributor
TPC-H: Total hot run time: 29629 ms |
Contributor
TPC-DS: Total hot run time: 169805 ms |
Member
Author
|
run nonConcurrent |
Member
Author
|
/review |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
I found regression-test standard issues that should be fixed before merge. The grammar change itself is small and focused, and the FE parser unit coverage exercises both identifier usage and role-mapping DDL ambiguity. No additional user-provided focus points were specified.
Critical checkpoint conclusions:
- Goal/test: The goal appears to be making RULE/CEL/MAPPING non-reserved in Nereids. The grammar change accomplishes that, and FE parser coverage is present. The new regression test needs to follow repository regression-test output standards.
- Scope: The parser change is minimal and focused.
- Concurrency/lifecycle/config/compatibility: No concurrency, lifecycle, new config, persistence, FE-BE protocol, or storage-format compatibility concerns found.
- Parallel paths: This PR updates Nereids grammar; I did not find another changed parser path in the actual GitHub PR diff.
- Testing: Coverage targets the right behavior, but the regression case uses inline asserts for deterministic query results and drops the table after the test, both contrary to AGENTS.md regression-test rules.
- Observability/performance/data correctness: No new runtime observability, performance, transaction, or data-visibility concerns found for this parser-only change.
starocean999
approved these changes
Jun 5, 2026
github-actions
Bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
yiguolei
pushed a commit
that referenced
this pull request
Jun 5, 2026
Contributor
FE Regression Coverage ReportIncrement line coverage |
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
5 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.
#61819
The role-mapping DDL added the keywords RULE, CEL and MAPPING to the lexer but did not add them to the
nonReservedrule, 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 ofCREATE ROLE MAPPING ...vsCREATE ROLE <name>.Add unit tests in RoleMappingParserTest and an end-to-end regression case test_role_mapping_keyword.