Skip to content

[ES|QL] Retrieve token text only when necessary #126578

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
merged 5 commits into from
Apr 11, 2025
Merged

[ES|QL] Retrieve token text only when necessary #126578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd7e601
retrieve token text only when necessary
fang-xing-esql Apr 9, 2025
3a53d86
Update docs/changelog/126578.yaml
fang-xing-esql Apr 10, 2025
e5b87a4
Merge branch 'main' into nameOrPosition-StringIndexOutOfBoundsException
fang-xing-esql Apr 10, 2025
912eecc
Merge branch 'main' into nameOrPosition-StringIndexOutOfBoundsException
fang-xing-esql Apr 10, 2025
56a2d16
Merge branch 'main' into nameOrPosition-StringIndexOutOfBoundsException
fang-xing-esql Apr 11, 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
5 changes: 5 additions & 0 deletions docs/changelog/126578.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 126578
summary: Retrieve token text only when necessary
area: ES|QL
type: bug
issues: []
6 changes: 3 additions & 3 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ParserUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ public static String text(ParseTree node) {
*/
public static String nameOrPosition(Token token) {
int tokenType = token.getType();
String s = token.getText();
// Retrieve text from the token only when necessary, when the token type is known.
return switch (tokenType) {
case EsqlBaseLexer.NAMED_OR_POSITIONAL_PARAM -> s.substring(SINGLE_PARAM);
case EsqlBaseLexer.NAMED_OR_POSITIONAL_DOUBLE_PARAMS -> s.substring(DOUBLE_PARAM);
case EsqlBaseLexer.NAMED_OR_POSITIONAL_PARAM -> token.getText().substring(SINGLE_PARAM);
case EsqlBaseLexer.NAMED_OR_POSITIONAL_DOUBLE_PARAMS -> token.getText().substring(DOUBLE_PARAM);
default -> EMPTY;
};
}
Expand Down
Loading