Skip to content

Commit 15ebd88

Browse files
committed
Clean up TODO comments
Already moved to meta issue
1 parent 14aefe9 commit 15ebd88

File tree

3 files changed

+0
-10
lines changed

3 files changed

+0
-10
lines changed

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ aggField
151151
;
152152

153153
qualifiedName
154-
// TODO: Test all kind of valid/invalid qualifier strings and make sure they make sense. Same for patterns below.
155-
// TODO: Account for qualifiers in parameters.
156154
: {this.isDevVersion()}? qualifier=UNQUOTED_IDENTIFIER name=unqualifiedName
157155
| name=unqualifiedName
158156
;
@@ -162,9 +160,6 @@ unqualifiedName
162160
;
163161

164162
qualifiedNamePattern
165-
// TODO: super duper restrict what's allowed in the qualifier, e.g. no dots, no wildcards, no QUOTES etc.
166-
// Can't easily do that via the lexer rules, as whatever token we use for the qualifier also needs to be a valid
167-
// token for the unqualifiedNamePattern.
168163
: {this.isDevVersion()}? qualifier=ID_PATTERN name=unqualifiedNamePattern
169164
| name=unqualifiedNamePattern
170165
;

x-pack/plugin/esql/src/main/antlr/parser/Join.g4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ joinCommand
1313
joinTarget
1414
// Cannot use UNQUOTED_IDENTIFIER for the qualifier because the lexer will confuse it with an UNQUOTED_SOURCE; would
1515
// require pushing a mode to the lexer to disambiguate.
16-
// TODO: UNQUOTED_SOURCE should be restricted further (no keywords, only simple chars) - and we should have reserved
17-
// characters for internal usage, and it must be a subset of UNQUOTED_IDENTIFIER.
1816
: {this.isDevVersion()}? index=indexPattern AS? qualifier=UNQUOTED_SOURCE
1917
| index=indexPattern
2018
;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ExpressionBuilder.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ public UnresolvedAttribute visitQualifiedName(EsqlBaseParser.QualifiedNameContex
273273
}
274274

275275
public UnresolvedAttribute visitQualifiedName(EsqlBaseParser.QualifiedNameContext ctx, UnresolvedAttribute defaultValue) {
276-
// TODO: Disallow qualifier + param (for now)
277276
if (ctx == null) {
278277
return defaultValue;
279278
}
@@ -331,7 +330,6 @@ protected NamedExpression visitQualifiedNamePattern(
331330

332331
@Override
333332
public NamedExpression visitQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext qualifiedCtx) {
334-
// TODO: Disallow qualifier + param (for now)
335333
if (qualifiedCtx == null) {
336334
return null;
337335
}
@@ -498,7 +496,6 @@ public NamedExpression visitQualifiedNamePattern(EsqlBaseParser.QualifiedNamePat
498496
result = new UnresolvedAttribute(src, qualifier, Strings.collectionToDelimitedString(objects, ""), null);
499497

500498
if (qualifier != null && qualifier.contains(WILDCARD)) {
501-
// TODO: much more rigorous check for unallowed characters in the qualifier
502499
throw qualifiersUnsupportedInPatterns(src, ((UnresolvedAttribute) result).qualifiedName());
503500
}
504501
}

0 commit comments

Comments
 (0)