Skip to content

Commit 7c4bcf4

Browse files
carlosdelestcarlosdelest
committed
Spotless
1 parent edc9b5f commit 7c4bcf4

File tree

5 files changed

+42
-43
lines changed

5 files changed

+42
-43
lines changed

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/FullTextFunction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ public Expression rewrite(QueryRewriteContext ctx) throws IOException {
385385
builder = builder == null
386386
? asQuery(LucenePushdownPredicates.DEFAULT, TranslatorHandler.TRANSLATOR_HANDLER).toQueryBuilder()
387387
: builder;
388-
builder = builder.rewrite(ctx);
388+
builder = builder.rewrite(ctx);
389389
if (builder != initial) {
390390
return replaceQueryBuilder(builder);
391391
}

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/Match.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ private static Match readFrom(StreamInput in) throws IOException {
299299
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_QUERY_BUILDER_IN_SEARCH_FUNCTIONS)) {
300300
queryBuilder = in.readOptionalNamedWriteable(QueryBuilder.class);
301301
}
302-
List <Expression> prefilters = List.of();
302+
List<Expression> prefilters = List.of();
303303
if (in.getTransportVersion().supports(MATCH_WITH_PREFILTERS)) {
304304
prefilters = in.readNamedWriteableCollectionAsList(Expression.class);
305305
}

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/PrefilteredFullTextFunction.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public abstract class PrefilteredFullTextFunction extends FullTextFunction {
2525
// Expressions to be used as prefilters in knn query
2626
private final List<Expression> filterExpressions;
2727

28-
2928
protected PrefilteredFullTextFunction(
3029
Source source,
3130
Expression query,

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

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,14 +1924,11 @@ public void testMatchSemanticTextPrefilters() {
19241924

19251925
checkFilteredFullTextFunctionWithPrefilter(
19261926
"match(semantic_text, \"hello world\")",
1927-
new SemanticQueryBuilder("semantic_text", "hello world")
1927+
new SemanticQueryBuilder("semantic_text", "hello world")
19281928
);
19291929
}
19301930

1931-
private void checkFilteredFullTextFunctionWithPrefilter(
1932-
String functionEsql,
1933-
FilteredQueryBuilder<?> expectedQueryBuilder
1934-
) {
1931+
private void checkFilteredFullTextFunctionWithPrefilter(String functionEsql, FilteredQueryBuilder<?> expectedQueryBuilder) {
19351932
String query = """
19361933
from test
19371934
| where %s
@@ -1959,15 +1956,17 @@ private void checkFilteredFullTextFunctionWithPrefilter(
19591956
public void testKnnPrefiltersWithMultipleFilters() {
19601957
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V5.isEnabled());
19611958

1962-
checkFilteredFullTextFunctionhMultipleFilters("knn(dense_vector, [0, 1, 2])",
1959+
checkFilteredFullTextFunctionhMultipleFilters(
1960+
"knn(dense_vector, [0, 1, 2])",
19631961
new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 1000, null, null, null, null)
19641962
);
19651963
}
19661964

19671965
public void testMatchSemanticTextPrefiltersWithMultipleFilters() {
19681966
assumeTrue("match with prefilters must be enabled", EsqlCapabilities.Cap.MATCH_SEMANTIC_TEXT_PREFILTER.isEnabled());
19691967

1970-
checkFilteredFullTextFunctionhMultipleFilters("match(semantic_text, \"hello world\")",
1968+
checkFilteredFullTextFunctionhMultipleFilters(
1969+
"match(semantic_text, \"hello world\")",
19711970
new SemanticQueryBuilder("semantic_text", "hello world")
19721971
);
19731972
}
@@ -1994,28 +1993,26 @@ public void checkFilteredFullTextFunctionhMultipleFilters(String esqlFunction, F
19941993
new Source(4, 8, "keyword == \"test\"")
19951994
);
19961995
QueryBuilder expectedFilterQueryBuilder = boolQuery().must(integerFilter).must(keywordFilter);
1997-
var expectedQuery = boolQuery().must(expectedQueryBuilder.addFilterQueries(List.of(expectedFilterQueryBuilder))).must(integerFilter).must(keywordFilter);
1996+
var expectedQuery = boolQuery().must(expectedQueryBuilder.addFilterQueries(List.of(expectedFilterQueryBuilder)))
1997+
.must(integerFilter)
1998+
.must(keywordFilter);
19981999
assertEquals(expectedQuery.toString(), queryExec.query().toString());
19992000
}
20002001

20012002
public void testPushDownNegatedConjunctionsToKnnPrefilter() {
20022003
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V5.isEnabled());
20032004

2004-
checkPushDownNegatedConjunctionsToPrefilter("knn(dense_vector, [0, 1, 2])", new KnnVectorQueryBuilder(
2005-
"dense_vector",
2006-
new float[]{0, 1, 2},
2007-
1000,
2008-
null,
2009-
null,
2010-
null,
2011-
null
2012-
));
2005+
checkPushDownNegatedConjunctionsToPrefilter(
2006+
"knn(dense_vector, [0, 1, 2])",
2007+
new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 1000, null, null, null, null)
2008+
);
20132009
}
20142010

20152011
public void testPushDownNegatedConjunctionsToMatchPrefilter() {
20162012
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.MATCH_SEMANTIC_TEXT_PREFILTER.isEnabled());
20172013

2018-
checkPushDownNegatedConjunctionsToPrefilter("match(semantic_text, \"hello world\")",
2014+
checkPushDownNegatedConjunctionsToPrefilter(
2015+
"match(semantic_text, \"hello world\")",
20192016
new SemanticQueryBuilder("semantic_text", "hello world")
20202017
);
20212018
}
@@ -2052,21 +2049,17 @@ private void checkPushDownNegatedConjunctionsToPrefilter(String esqlQuery, Filte
20522049
public void testNotPushDownDisjunctionsToPrefilterToKnnPrefilter() {
20532050
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V5.isEnabled());
20542051

2055-
checkNotPushDownDisjunctionsToPrefilter("knn(dense_vector, [0, 1, 2])", new KnnVectorQueryBuilder(
2056-
"dense_vector",
2057-
new float[]{0, 1, 2},
2058-
1000,
2059-
null,
2060-
null,
2061-
null,
2062-
null
2063-
));
2052+
checkNotPushDownDisjunctionsToPrefilter(
2053+
"knn(dense_vector, [0, 1, 2])",
2054+
new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 1000, null, null, null, null)
2055+
);
20642056
}
20652057

20662058
public void testNotPushDownDisjunctionsToPrefilterToMatchPrefilter() {
20672059
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.MATCH_SEMANTIC_TEXT_PREFILTER.isEnabled());
20682060

2069-
checkNotPushDownDisjunctionsToPrefilter("match(semantic_text, \"hello world\")",
2061+
checkNotPushDownDisjunctionsToPrefilter(
2062+
"match(semantic_text, \"hello world\")",
20702063
new SemanticQueryBuilder("semantic_text", "hello world")
20712064
);
20722065
}
@@ -2107,8 +2100,7 @@ public void testNotPushDownKnnWithNonPushablePrefilters() {
21072100
public void testNotPushDownMatchWithNonPushablePrefilters() {
21082101
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.MATCH_SEMANTIC_TEXT_PREFILTER.isEnabled());
21092102

2110-
checkNotPushDownWithNonPushablePrefilters("match(semantic_text, \"hello world\")"
2111-
);
2103+
checkNotPushDownWithNonPushablePrefilters("match(semantic_text, \"hello world\")");
21122104
}
21132105

21142106
private void checkNotPushDownWithNonPushablePrefilters(String esqlQuery) {
@@ -2147,24 +2139,31 @@ private void checkNotPushDownWithNonPushablePrefilters(String esqlQuery) {
21472139
public void testPushDownComplexNegationsToKnnPrefilter() {
21482140
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V5.isEnabled());
21492141

2150-
checkPushDownComplexNegationsToPrefilter("knn(dense_vector, [0, 1, 2])", "knn(dense_vector, [4, 5, 6])",
2142+
checkPushDownComplexNegationsToPrefilter(
2143+
"knn(dense_vector, [0, 1, 2])",
2144+
"knn(dense_vector, [4, 5, 6])",
21512145
new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 1000, null, null, null, null),
21522146
new KnnVectorQueryBuilder("dense_vector", new float[] { 4, 5, 6 }, 1000, null, null, null, null)
2153-
);
2147+
);
21542148
}
21552149

21562150
public void testPushDownComplexNegationsToMatchPrefilter() {
21572151
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.MATCH_SEMANTIC_TEXT_PREFILTER.isEnabled());
21582152

2159-
checkPushDownComplexNegationsToPrefilter("match(semantic_text, \"hello world\")",
2153+
checkPushDownComplexNegationsToPrefilter(
2154+
"match(semantic_text, \"hello world\")",
21602155
"match(semantic_text, \"hello, hello\")",
21612156
new SemanticQueryBuilder("semantic_text", "hello world"),
21622157
new SemanticQueryBuilder("semantic_text", "hello, hello")
21632158
);
21642159
}
21652160

2166-
public void checkPushDownComplexNegationsToPrefilter(String esqlQuery1, String esqlQuery2,
2167-
FilteredQueryBuilder<?> expectedQueryBuilder1, FilteredQueryBuilder<?> expectedQueryBuilder2) {
2161+
public void checkPushDownComplexNegationsToPrefilter(
2162+
String esqlQuery1,
2163+
String esqlQuery2,
2164+
FilteredQueryBuilder<?> expectedQueryBuilder1,
2165+
FilteredQueryBuilder<?> expectedQueryBuilder2
2166+
) {
21682167
String query = String.format(Locale.ROOT, """
21692168
from test
21702169
| where ((%s
@@ -2213,7 +2212,9 @@ public void checkPushDownComplexNegationsToPrefilter(String esqlQuery1, String e
22132212
public void testMultipleKnnQueriesInPrefilters() {
22142213
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V5.isEnabled());
22152214

2216-
checkMultipleQueriesInPrefilters("knn(dense_vector, [0, 1, 2])", "knn(dense_vector, [4, 5, 6])",
2215+
checkMultipleQueriesInPrefilters(
2216+
"knn(dense_vector, [0, 1, 2])",
2217+
"knn(dense_vector, [4, 5, 6])",
22172218
new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 1000, null, null, null, null),
22182219
new KnnVectorQueryBuilder("dense_vector", new float[] { 4, 5, 6 }, 1000, null, null, null, null)
22192220
);
@@ -2222,7 +2223,8 @@ public void testMultipleKnnQueriesInPrefilters() {
22222223
public void testMultipleMatchQueriesInPrefilters() {
22232224
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.MATCH_SEMANTIC_TEXT_PREFILTER.isEnabled());
22242225

2225-
checkMultipleQueriesInPrefilters("match(semantic_text, \"hello world\")",
2226+
checkMultipleQueriesInPrefilters(
2227+
"match(semantic_text, \"hello world\")",
22262228
"match(semantic_text, \"hello, hello\")",
22272229
new SemanticQueryBuilder("semantic_text", "hello world"),
22282230
new SemanticQueryBuilder("semantic_text", "hello, hello")
@@ -2250,7 +2252,6 @@ public void checkMultipleQueriesInPrefilters(
22502252
var field = as(project.child(), FieldExtractExec.class);
22512253
var queryExec = as(field.child(), EsQueryExec.class);
22522254

2253-
22542255
// Integer range query (right side of first OR)
22552256
QueryBuilder integerRangeQuery = wrapWithSingleQuery(
22562257
query,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,21 @@
77

88
package org.elasticsearch.xpack.esql.optimizer;
99

10-
import org.elasticsearch.action.ActionListener;
1110
import org.elasticsearch.action.support.PlainActionFuture;
1211
import org.elasticsearch.index.query.MatchQueryBuilder;
1312
import org.elasticsearch.index.query.QueryBuilder;
1413
import org.elasticsearch.index.query.QueryRewriteContext;
1514
import org.elasticsearch.xpack.esql.EsqlTestUtils;
1615
import org.elasticsearch.xpack.esql.analysis.Analyzer;
1716
import org.elasticsearch.xpack.esql.core.expression.FoldContext;
17+
import org.elasticsearch.xpack.esql.expression.function.fulltext.QueryBuilderResolver;
1818
import org.elasticsearch.xpack.esql.parser.EsqlParser;
1919
import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
2020
import org.elasticsearch.xpack.esql.plan.physical.EstimatesRowSize;
2121
import org.elasticsearch.xpack.esql.plan.physical.PhysicalPlan;
2222
import org.elasticsearch.xpack.esql.planner.PlannerUtils;
2323
import org.elasticsearch.xpack.esql.planner.mapper.Mapper;
2424
import org.elasticsearch.xpack.esql.planner.premapper.PreMapper;
25-
import org.elasticsearch.xpack.esql.expression.function.fulltext.QueryBuilderResolver;
2625
import org.elasticsearch.xpack.esql.plugin.EsqlFlags;
2726
import org.elasticsearch.xpack.esql.plugin.TransportActionServices;
2827
import org.elasticsearch.xpack.esql.session.Configuration;

0 commit comments

Comments
 (0)