Skip to content

Commit 216bdc6

Browse files
Fix tests
1 parent 595e946 commit 216bdc6

File tree

2 files changed

+14
-27
lines changed

2 files changed

+14
-27
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ public static <T> List<T> visitList(ParseTreeVisitor<?> visitor, List<? extends
6262

6363
List<T> results = new ArrayList<>(contexts.size());
6464
for (ParserRuleContext context : contexts) {
65-
// TODO: revert
66-
var result = visitor.visit(context);
67-
results.add(clazz.cast(result));
65+
results.add(clazz.cast(visitor.visit(context)));
6866
}
6967
return results;
7068
}

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3490,30 +3490,6 @@ private void assertEmptyEsRelation(LogicalPlan plan) {
34903490
assertThat(esRelation.output(), equalTo(NO_FIELDS));
34913491
}
34923492

3493-
public void testResolveRerankInferenceId1() {
3494-
assumeTrue("Requires RERANK command", EsqlCapabilities.Cap.RERANK.isEnabled());
3495-
3496-
// Substring function is named, should work.
3497-
LogicalPlan plan = analyze("""
3498-
FROM movies METADATA _score
3499-
| WHERE QSTR("star wars")
3500-
| RERANK "star wars" ON title, str=SUBSTRING(overview, 0, 100), actors WITH rerankerInferenceId""", "mapping-books.json");
3501-
Rerank rerank = as(as(plan, Limit.class).child(), Rerank.class);
3502-
assertThat(rerank.inferenceId(), equalTo(string("reranking-inference-id")));
3503-
}
3504-
3505-
public void testResolveRerankInferenceId2() {
3506-
assumeTrue("Requires RERANK command", EsqlCapabilities.Cap.RERANK.isEnabled());
3507-
3508-
// Substring function is unnamed, should fail.
3509-
LogicalPlan plan = analyze("""
3510-
FROM movies METADATA _score
3511-
| WHERE QSTR("star wars")
3512-
| RERANK "star wars" ON title, SUBSTRING(overview, 0, 100), actors WITH rerankerInferenceId""", "mapping-books.json");
3513-
Rerank rerank = as(as(plan, Limit.class).child(), Rerank.class);
3514-
assertThat(rerank.inferenceId(), equalTo(string("reranking-inference-id")));
3515-
}
3516-
35173493
public void testResolveRerankInferenceId() {
35183494
assumeTrue("Requires RERANK command", EsqlCapabilities.Cap.RERANK.isEnabled());
35193495

@@ -3635,6 +3611,19 @@ public void testResolveRerankFields() {
36353611
assertThat(rerank.scoreAttribute(), equalTo(getAttributeByName(relation.output(), MetadataAttribute.SCORE)));
36363612
}
36373613

3614+
{
3615+
// Unnamed field.
3616+
try {
3617+
LogicalPlan plan = analyze("""
3618+
FROM books METADATA _score
3619+
| WHERE title:"food"
3620+
| RERANK "food" ON title, SUBSTRING(description, 0, 100), yearRenamed=year WITH `reranking-inference-id`
3621+
""", "mapping-books.json");
3622+
} catch (ParsingException ex) {
3623+
assertThat(ex.getMessage(), containsString("line 3:36: mismatched input '(' expecting {'=', ',', '.', 'with'}"));
3624+
}
3625+
}
3626+
36383627
{
36393628
VerificationException ve = expectThrows(
36403629
VerificationException.class,

0 commit comments

Comments
 (0)