Skip to content

Resolve reduce/reduce conflict in our syntax #1811

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.

Sign up for GitHub

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

Merged
imay merged 1 commit into from
Sep 16, 2019
Merged

Resolve reduce/reduce conflict in our syntax #1811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions fe/src/main/cup/sql_parser.cup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2712,10 +2712,6 @@ set_expr_or_default ::=
{:
RESULT = new StringLiteral("ALL");
:}
| ident:name
{:
RESULT = new StringLiteral(name);
:}
| expr:expr
{:
RESULT = expr;
Expand Down
5 changes: 5 additions & 0 deletions fe/src/main/java/org/apache/doris/analysis/SetVar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
return;
}

// For the case like "set character_set_client = utf8", we change SlotRef to StringLiteral.
if (value instanceof SlotRef) {
value = new StringLiteral(((SlotRef) value).getColumnName());
}

value.analyze(analyzer);
if (!value.isConstant()) {
throw new AnalysisException("Set statement does't support non-constant expr.");
Expand Down