Fixes a bug with expressions when functions are combined with and/or operations#6669
Merged
Merged
Conversation
…operations. The function composition change (opensearch-project#6628) converted function from a lexer rule to a parser rule, which meant function arguments became full parser sub-expressions (including conditionalExpression ). The ParseTreeEvaluatorListener uses LPAREN/RPAREN tokens on the operatorSymbolStack as barriers to prevent operators from being evaluated inside nested scopes - this is how parenthesesExpression works correctly. However, the function composition code explicitly skipped LPAREN/RPAREN tokens inside functions, removing this barrier. When a multi-argument function appeared as the right operand of and/or, the AND operator sitting on the stack would fire prematurely when the walker exited the inner conditionalExpression of a function argument, consuming the function's arguments as boolean operands, silently pushing false, and leaving the function with only one argument instead of two. The fix simply stops skipping LPAREN/RPAREN inside functions, letting them flow through to the normal handling where they act as operator stack barriers. Signed-off-by: David Venable <dlv@amazon.com>
dlvenable
requested review from
KarstenSchnitter,
dinujoh,
engechas,
graytaylor0,
kkondaka,
oeyh,
san81,
sb2k16 and
srikanthjg
as code owners
graytaylor0
approved these changes
Mar 23, 2026
kkondaka
approved these changes
Mar 23, 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.
Description
The function composition change (#6628) converted function from a lexer rule to a parser rule, which meant function arguments became full parser sub-expressions (including
conditionalExpression). TheParseTreeEvaluatorListenerusesLPAREN/RPARENtokens on theoperatorSymbolStackas barriers to prevent operators from being evaluated inside nested scopes - this is howparenthesesExpressionworks correctly. However, the function composition code explicitly skippedLPAREN/RPARENtokens inside functions, removing this barrier. When a multi-argument function appeared as the right operand ofand/or, theANDoperator sitting on the stack would fire prematurely when the walker exited the innerconditionalExpressionof a function argument, consuming the function's arguments as boolean operands, silently pushing false, and leaving the function with only one argument instead of two.The fix simply stops skipping
LPAREN/RPARENinside functions, letting them flow through to the normal handling where they act as operator stack barriers.Issues Resolved
N/A
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.