Skip to content

Commit ffc0178

Browse files
Re-add lenient
1 parent 7632048 commit ffc0178

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ private void checkMatchFunctionPushDown(
12221222
var fieldExtract = as(project.child(), FieldExtractExec.class);
12231223
var actualLuceneQuery = as(fieldExtract.child(), EsQueryExec.class).query();
12241224

1225-
var expectedLuceneQuery = new MatchQueryBuilder(fieldName, expectedValueProvider.apply(queryValue));
1225+
var expectedLuceneQuery = new MatchQueryBuilder(fieldName, expectedValueProvider.apply(queryValue)).lenient(true);
12261226
assertThat("Unexpected match query for data type " + fieldDataType, actualLuceneQuery, equalTo(expectedLuceneQuery));
12271227
} catch (ParsingException e) {
12281228
fail("Error parsing ESQL query: " + esqlQuery + "\n" + e.getMessage());
@@ -1288,7 +1288,8 @@ public void testMatchOptionsPushDown() {
12881288
.boost(2.1f)
12891289
.minimumShouldMatch("2")
12901290
.operator(Operator.AND)
1291-
.prefixLength(3);
1291+
.prefixLength(3)
1292+
.lenient(true);
12921293
assertThat(actualLuceneQuery.toString(), is(expectedLuceneQuery.toString()));
12931294
}
12941295

@@ -1952,7 +1953,8 @@ public void testMatchFunctionWithStatsWherePushable() {
19521953
var agg = as(limit.child(), AggregateExec.class);
19531954
var exchange = as(agg.child(), ExchangeExec.class);
19541955
var stats = as(exchange.child(), EsStatsQueryExec.class);
1955-
QueryBuilder expected = new MatchQueryBuilder("last_name", "Smith");
1956+
var expected = new MatchQueryBuilder("last_name", "Smith");
1957+
expected = expected.lenient(true);
19561958
assertThat(stats.query().toString(), equalTo(expected.toString()));
19571959
}
19581960

@@ -1972,7 +1974,8 @@ public void testMatchFunctionWithStatsPushableAndNonPushableCondition() {
19721974
assertTrue(filter.condition() instanceof GreaterThan);
19731975
var fieldExtract = as(filter.child(), FieldExtractExec.class);
19741976
var esQuery = as(fieldExtract.child(), EsQueryExec.class);
1975-
QueryBuilder expected = new MatchQueryBuilder("last_name", "Smith");
1977+
var expected = new MatchQueryBuilder("last_name", "Smith");
1978+
expected = expected.lenient(true);
19761979
assertThat(esQuery.query().toString(), equalTo(expected.toString()));
19771980
}
19781981

@@ -2122,7 +2125,7 @@ private class MatchFunctionTestCase extends FullTextFunctionTestCase {
21222125

21232126
@Override
21242127
public QueryBuilder queryBuilder() {
2125-
return new MatchQueryBuilder(fieldName(), queryString());
2128+
return new MatchQueryBuilder(fieldName(), queryString()).lenient(true);
21262129
}
21272130

21282131
@Override
@@ -2138,7 +2141,7 @@ private class MatchOperatorTestCase extends FullTextFunctionTestCase {
21382141

21392142
@Override
21402143
public QueryBuilder queryBuilder() {
2141-
return new MatchQueryBuilder(fieldName(), queryString());
2144+
return new MatchQueryBuilder(fieldName(), queryString()).lenient(true);
21422145
}
21432146

21442147
@Override

0 commit comments

Comments
 (0)