Skip to content

[GEODE-10508] Remedation of ANTLR nondeterminism warnings in OQL grammar #7942

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[GEODE-10508] Remedation of ANTLR nondeterminism warnings in OQL grammar #7942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b44421a
GEODE-10508: Fix ANTLR nondeterminism warnings in OQL grammar
JinwooHwang Oct 23, 2025
9ba0d3f
GEODE-10508: Apply code formatting to test file
JinwooHwang Oct 23, 2025
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
17 changes: 13 additions & 4 deletions geode-core/src/main/antlr/org/apache/geode/cache/query/internal/parse/oql.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,11 +571,16 @@ projectionAttributes :

projection!{ AST node = null;}:

lb1:identifier TOK_COLON! ( tok1:aggregateExpr{node = #tok1;} | tok2:expr{node = #tok2;})
// Use syntactic predicate to resolve nondeterminism between aggregateExpr and expr.
// The predicate checks for aggregate function keywords (sum, avg, min, max, count) followed by '('.
// Without this, the parser cannot determine which alternative to choose when it sees these keywords,
// since they can also be used as identifiers in regular expressions.
lb1:identifier TOK_COLON! ( (("sum"|"avg"|"min"|"max"|"count") TOK_LPAREN)=> tok1:aggregateExpr{node = #tok1;} | tok2:expr{node = #tok2;})
{ #projection = #([PROJECTION, "projection",
"org.apache.geode.cache.query.internal.parse.ASTProjection"], node, #lb1); }
|
(tok3:aggregateExpr{node = #tok3;} | tok4:expr{node = #tok4;})
// Same syntactic predicate as above to handle projections without a label (identifier:)
((("sum"|"avg"|"min"|"max"|"count") TOK_LPAREN)=> tok3:aggregateExpr{node = #tok3;} | tok4:expr{node = #tok4;})
(
"as"
lb2: identifier
Expand Down Expand Up @@ -958,7 +963,10 @@ collectionExpr :
aggregateExpr { int aggFunc = -1; boolean distinctOnly = false; }:

!("sum" {aggFunc = SUM;} | "avg" {aggFunc = AVG;} )
TOK_LPAREN ("distinct"! {distinctOnly = true;} ) ? tokExpr1:expr TOK_RPAREN
// Use greedy option to resolve nondeterminism with optional 'distinct' keyword.
// Greedy tells the parser to match 'distinct' whenever it appears, rather than
// being ambiguous about whether to match it or skip directly to the expression.
TOK_LPAREN (options {greedy=true;}: "distinct"! {distinctOnly = true;} ) ? tokExpr1:expr TOK_RPAREN
{ #aggregateExpr = #([AGG_FUNC, "aggregate", "org.apache.geode.cache.query.internal.parse.ASTAggregateFunc"],
#tokExpr1);
((ASTAggregateFunc)#aggregateExpr).setAggregateFunctionType(aggFunc);
Expand All @@ -975,8 +983,9 @@ aggregateExpr { int aggFunc = -1; boolean distinctOnly = false; }:

|
"count"^<AST=org.apache.geode.cache.query.internal.parse.ASTAggregateFunc>
// Same greedy option as above for count's optional 'distinct' keyword
TOK_LPAREN! ( TOK_STAR <AST=org.apache.geode.cache.query.internal.parse.ASTDummy>
| ("distinct"! {distinctOnly = true;} ) ? expr ) TOK_RPAREN!
| (options {greedy=true;}: "distinct"! {distinctOnly = true;} ) ? expr ) TOK_RPAREN!
{
((ASTAggregateFunc)#aggregateExpr).setAggregateFunctionType(COUNT);
#aggregateExpr.setText("aggregate");
Expand Down
9 changes: 8 additions & 1 deletion ...c/test/java/org/apache/geode/cache/query/internal/AbstractCompiledValueTestJUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.test.junit.runners.GeodeParamsRunner;

Expand All @@ -47,7 +48,13 @@ private CompiledValue[] getCompiledValuesWhichDoNotImplementGetReceiver() {
new LinkedHashMap<>()),
new CompiledIn(compiledValue1, compiledValue2),
new CompiledIteratorDef("test", new CollectionTypeImpl(), compiledValue1),
new CompiledJunction(new CompiledValue[] {compiledValue1, compiledValue2}, 89),
// Changed from hardcoded value 89 to OQLLexerTokenTypes.LITERAL_or constant.
// The hardcoded value 89 was the token number for LITERAL_or in the original grammar,
// but after adding syntactic predicates to fix nondeterminism warnings, the token
// numbering changed (LITERAL_or is now 94). Using the constant ensures this test
// remains correct regardless of future grammar changes.
new CompiledJunction(new CompiledValue[] {compiledValue1, compiledValue2},
OQLLexerTokenTypes.LITERAL_or),
new CompiledLike(compiledValue1, compiledValue2),
new CompiledLiteral(compiledValue1),
new CompiledMod(compiledValue1, compiledValue2),
Expand Down
Loading