QL: Introduce ParserUtils to consolidate code #76399
Merged
Conversation
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
costin
added
>enhancement
:Analytics/SQL
elasticmachine
added
the
Team:QL (Deprecated)
|
Pinging @elastic/es-ql (Team:QL) |
Move common ANTLR utility methods, such as extracting code or case insensitive streams into QL. Replace CaseInsensitiveStream (which relies on ANTLRInputStream which has been deprecated) with a CharStream variant.
costin
force-pushed
the
ql/ql-parsing-utils
branch
from
77de38d to
3f8c628
Compare
💚 Backport successful
|
costin
added a commit
that referenced
this pull request
Aug 12, 2021
Luegg
reviewed
Aug 12, 2021
| throw new ParsingException(source(ctx), "Invalid query '{}'[{}] given; expected {} but found {}", | ||
| ctx.getText(), ctx.getClass().getSimpleName(), | ||
| type.getSimpleName(), (result != null ? result.getClass().getSimpleName() : "null")); | ||
| return ParserUtils.typedParsing(this, ctx, type); |
There was a problem hiding this comment.
Could typedParsing also be removed from AbstractBuilder and all usage replaced by ParserUtils.typedParsing (same as for visitList)?
| * @param stream The stream to wrap. | ||
| * @param upper If true force each symbol to upper case, otherwise force to lower. | ||
| */ | ||
| public CaseChangingCharStream(CharStream stream, boolean upper) { |
There was a problem hiding this comment.
is there a use case for upper = false for us?
There was a problem hiding this comment.
Not at the moment. The class has been copied from ANTLR. Since the bool is a final variable, I expect the JIT to optimize this code nicely.
costin
added a commit
to costin/elasticsearch
that referenced
this pull request
Aug 12, 2021
Remove typedParsing method in favor of ParserUtils Follow-up to elastic#76399
elasticsearchmachine
pushed a commit
that referenced
this pull request
Aug 12, 2021
Remove typedParsing method in favor of ParserUtils Follow-up to #76399
elasticsearchmachine
pushed a commit
that referenced
this pull request
Aug 12, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Move common ANTLR utility methods, such as extracting code or case
insensitive streams into QL.
Replace CaseInsensitiveStream (which relies on ANTLRInputStream which
has been deprecated) with a CharStream variant.