Skip to content

ES|QL: fix ENRICH validation for use of wildcards #121911

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
Feb 7, 2025
Merged

ES|QL: fix ENRICH validation for use of wildcards #121911

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf3c7e4
ES|QL: fix ENRICH validation for use of wildcards
luigidellaquila Feb 6, 2025
d266c6b
Update docs/changelog/121911.yaml
luigidellaquila Feb 6, 2025
fc2c674
Better error message
luigidellaquila Feb 7, 2025
1f8fda0
Merge remote-tracking branch 'luigidellaquila/esql/fix_enrich_wildcar…
luigidellaquila Feb 7, 2025
621a2b3
Merge branch 'main' into esql/fix_enrich_wildcard_validation
luigidellaquila Feb 7, 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/121911.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 121911
summary: Fix ENRICH validation for use of wildcards
area: ES|QL
type: bug
issues: []
4 changes: 2 additions & 2 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ExpressionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,9 +795,9 @@ public NamedExpression visitEnrichWithClause(EsqlBaseParser.EnrichWithClauseCont

private NamedExpression enrichFieldName(EsqlBaseParser.QualifiedNamePatternContext ctx) {
return visitQualifiedNamePattern(ctx, ne -> {
if (ne instanceof UnresolvedNamePattern up) {
if (ne instanceof UnresolvedNamePattern || ne instanceof UnresolvedStar) {
var src = ne.source();
throw new ParsingException(src, "Using wildcards [*] in ENRICH WITH projections is not allowed [{}]", up.pattern());
throw new ParsingException(src, "Using wildcards [*] in ENRICH WITH projections is not allowed [{}]", src.text());
Copy link
Contributor

@astefan astefan Feb 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
throw new ParsingException(src, "Using wildcards [*] in ENRICH WITH projections is not allowed [{}]", src.text());
throw new ParsingException(src, "Using wildcards [*] in ENRICH WITH projections is not allowed, found [{}]", src.text());

}
});
}
Expand Down
4 changes: 4 additions & 0 deletions ...k/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,15 +1082,19 @@ public void testEnrich() {
);

expectError("from a | enrich countries on foo* ", "Using wildcards [*] in ENRICH WITH projections is not allowed [foo*]");
expectError("from a | enrich countries on * ", "Using wildcards [*] in ENRICH WITH projections is not allowed [*]");
expectError("from a | enrich countries on foo with bar*", "Using wildcards [*] in ENRICH WITH projections is not allowed [bar*]");
expectError("from a | enrich countries on foo with *", "Using wildcards [*] in ENRICH WITH projections is not allowed [*]");
expectError(
"from a | enrich countries on foo with x = bar* ",
"Using wildcards [*] in ENRICH WITH projections is not allowed [bar*]"
);
expectError("from a | enrich countries on foo with x = * ", "Using wildcards [*] in ENRICH WITH projections is not allowed [*]");
expectError(
"from a | enrich countries on foo with x* = bar ",
"Using wildcards [*] in ENRICH WITH projections is not allowed [x*]"
);
expectError("from a | enrich countries on foo with * = bar ", "Using wildcards [*] in ENRICH WITH projections is not allowed [*]");
expectError(
"from a | enrich typo:countries on foo",
"line 1:17: Unrecognized value [typo], ENRICH policy qualifier needs to be one of [_ANY, _COORDINATOR, _REMOTE]"
Expand Down