Skip to content

Check SCORE_FUNCTION capability in VerifierTests #131352

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 6 commits into from
Jul 16, 2025
Merged

Check SCORE_FUNCTION capability in VerifierTests #131352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b65d5d1
Check SCORE_FUNCTION capability in VerifierTests
tteofili Jul 16, 2025
dd67885
Merge branch 'main' of github.com:elastic/elasticsearch into esql_sco…
tteofili Jul 16, 2025
2c869f5
test fix
tteofili Jul 16, 2025
41ee99d
[CI] Auto commit changes from spotless
Jul 16, 2025
36dfc42
Merge branch 'main' of github.com:elastic/elasticsearch into esql_sco…
tteofili Jul 16, 2025
e0e0cb2
Merge branch 'esql_score_function_verifier_check' of github.com:tteof…
tteofili Jul 16, 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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,6 @@ tests:
- class: org.elasticsearch.xpack.esql.expression.function.fulltext.ScoreTests
method: testSerializationOfSimple {TestCase=<boolean>}
issue: https://github.com/elastic/elasticsearch/issues/131334
- class: org.elasticsearch.xpack.esql.analysis.VerifierTests
method: testFullTextFunctionsOnlyAllowedInWhere
issue: https://github.com/elastic/elasticsearch/issues/131335
- class: org.elasticsearch.xpack.esql.analysis.VerifierTests
method: testMatchInsideEval
issue: https://github.com/elastic/elasticsearch/issues/131336
Expand Down
16 changes: 13 additions & 3 deletions x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,9 @@ public void testWeightedAvg() {

public void testMatchInsideEval() throws Exception {
assertEquals(
"1:36: [:] operator is only supported in WHERE and STATS commands, or in EVAL within score(.) function\n"
"1:36: [:] operator is only supported in WHERE and STATS commands"
+ (EsqlCapabilities.Cap.SCORE_FUNCTION.isEnabled() ? ", or in EVAL within score(.) function" : "")
+ "\n"
+ "line 1:36: [:] operator cannot operate on [title], which is not a field from an index mapping",
error("row title = \"brown fox\" | eval x = title:\"fox\" ")
);
Expand Down Expand Up @@ -1385,7 +1387,8 @@ private void checkFullTextFunctionsOnlyAllowedInWhere(String functionName, Strin
+ functionName
+ "] "
+ functionType
+ " is only supported in WHERE and STATS commands, or in EVAL within score(.) function"
+ " is only supported in WHERE and STATS commands"
+ (EsqlCapabilities.Cap.SCORE_FUNCTION.isEnabled() ? ", or in EVAL within score(.) function" : "")
)
);
assertThat(
Expand All @@ -1400,7 +1403,14 @@ private void checkFullTextFunctionsOnlyAllowedInWhere(String functionName, Strin
if ("KQL".equals(functionName) || "QSTR".equals(functionName)) {
assertThat(
error("row a = " + functionInvocation, fullTextAnalyzer),
containsString("[" + functionName + "] " + functionType + " is only supported in WHERE and STATS commands")
containsString(
"["
+ functionName
+ "] "
+ functionType
+ " is only supported in WHERE and STATS commands"
+ (EsqlCapabilities.Cap.SCORE_FUNCTION.isEnabled() ? ", or in EVAL within score(.) function" : "")
)
);
}
}
Expand Down