Skip to content

Commit c2e8cdb

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 708180e commit c2e8cdb

File tree

7 files changed

+59
-11
lines changed

7 files changed

+59
-11
lines changed

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,8 @@
6868
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.availableDatasetsForEs;
6969
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.clusterHasInferenceEndpoint;
7070
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.clusterHasRerankInferenceEndpoint;
71-
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.clusterHasRerankInferenceEndpoint;
7271
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.createInferenceEndpoint;
7372
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.createRerankInferenceEndpoint;
74-
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.createRerankInferenceEndpoint;
7573
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.deleteInferenceEndpoint;
7674
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.deleteRerankInferenceEndpoint;
7775
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.loadDataSetIntoEs;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/PreAnalyzer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ public static class PreAnalysis {
3131
public final List<InferencePlan<?>> inferencePlans;
3232
public final List<TableInfo> lookupIndices;
3333

34-
public PreAnalysis(List<TableInfo> indices, List<Enrich> enriches, List<InferencePlan<?>> inferencePlans, List<TableInfo> lookupIndices) {
34+
public PreAnalysis(
35+
List<TableInfo> indices,
36+
List<Enrich> enriches,
37+
List<InferencePlan<?>> inferencePlans,
38+
List<TableInfo> lookupIndices
39+
) {
3540
this.indices = indices;
3641
this.enriches = enriches;
3742
this.inferencePlans = inferencePlans;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/mapper/Mapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.xpack.esql.plan.logical.TopN;
2424
import org.elasticsearch.xpack.esql.plan.logical.UnaryPlan;
2525
import org.elasticsearch.xpack.esql.plan.logical.inference.Rerank;
26-
import org.elasticsearch.xpack.esql.plan.logical.join.InlineJoin;
2726
import org.elasticsearch.xpack.esql.plan.logical.join.Join;
2827
import org.elasticsearch.xpack.esql.plan.logical.join.JoinConfig;
2928
import org.elasticsearch.xpack.esql.plan.logical.join.JoinTypes;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,14 @@ PreAnalysisResult withInferenceResolution(InferenceResolution newInferenceResolu
796796
}
797797

798798
PreAnalysisResult withIndexResolution(IndexResolution newIndexResolution) {
799-
return new PreAnalysisResult(newIndexResolution, lookupIndices(), enrichResolution(), fieldNames(), wildcardJoinIndices(), inferenceResolution());
799+
return new PreAnalysisResult(
800+
newIndexResolution,
801+
lookupIndices(),
802+
enrichResolution(),
803+
fieldNames(),
804+
wildcardJoinIndices(),
805+
inferenceResolution()
806+
);
800807
}
801808

802809
PreAnalysisResult addLookupIndexResolution(String index, IndexResolution newIndexResolution) {
@@ -805,11 +812,25 @@ PreAnalysisResult addLookupIndexResolution(String index, IndexResolution newInde
805812
}
806813

807814
PreAnalysisResult withFieldNames(Set<String> newFields) {
808-
return new PreAnalysisResult(indices(), lookupIndices(), enrichResolution(), newFields, wildcardJoinIndices(), inferenceResolution());
815+
return new PreAnalysisResult(
816+
indices(),
817+
lookupIndices(),
818+
enrichResolution(),
819+
newFields,
820+
wildcardJoinIndices(),
821+
inferenceResolution()
822+
);
809823
}
810824

811825
public PreAnalysisResult withWildcardJoinIndices(Set<String> wildcardJoinIndices) {
812-
return new PreAnalysisResult(indices(), lookupIndices(), enrichResolution(), fieldNames(), wildcardJoinIndices, inferenceResolution());
826+
return new PreAnalysisResult(
827+
indices(),
828+
lookupIndices(),
829+
enrichResolution(),
830+
fieldNames(),
831+
wildcardJoinIndices,
832+
inferenceResolution()
833+
);
813834
}
814835
}
815836
}

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,13 @@ public void testEnrichPolicyWithError() {
16331633
enrichResolution.addError("languages", Enrich.Mode.ANY, "error-2");
16341634
enrichResolution.addError("foo", Enrich.Mode.ANY, "foo-error-101");
16351635

1636-
AnalyzerContext context = new AnalyzerContext(configuration("from test"), new EsqlFunctionRegistry(), testIndex, enrichResolution, defaultInferenceResolution());
1636+
AnalyzerContext context = new AnalyzerContext(
1637+
configuration("from test"),
1638+
new EsqlFunctionRegistry(),
1639+
testIndex,
1640+
enrichResolution,
1641+
defaultInferenceResolution()
1642+
);
16371643
Analyzer analyzer = new Analyzer(context, TEST_VERIFIER);
16381644
{
16391645
LogicalPlan plan = analyze("from test | EVAL x = to_string(languages) | ENRICH _coordinator:languages ON x", analyzer);
@@ -1783,7 +1789,13 @@ public void testEnrichFieldsIncludeMatchField() {
17831789
languageIndex.get().mapping()
17841790
)
17851791
);
1786-
AnalyzerContext context = new AnalyzerContext(configuration(query), new EsqlFunctionRegistry(), testIndex, enrichResolution, defaultInferenceResolution());
1792+
AnalyzerContext context = new AnalyzerContext(
1793+
configuration(query),
1794+
new EsqlFunctionRegistry(),
1795+
testIndex,
1796+
enrichResolution,
1797+
defaultInferenceResolution()
1798+
);
17871799
Analyzer analyzer = new Analyzer(context, TEST_VERIFIER);
17881800
LogicalPlan plan = analyze(query, analyzer);
17891801
var limit = as(plan, Limit.class);

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,14 @@ private Analyzer makeAnalyzer(String mappingFileName, EnrichResolution enrichRes
207207
IndexResolution getIndexResult = IndexResolution.valid(test);
208208

209209
return new Analyzer(
210-
new AnalyzerContext(config, new EsqlFunctionRegistry(), getIndexResult, defaultLookupResolution(), enrichResolution, emptyInferenceResolution()),
210+
new AnalyzerContext(
211+
config,
212+
new EsqlFunctionRegistry(),
213+
getIndexResult,
214+
defaultLookupResolution(),
215+
enrichResolution,
216+
emptyInferenceResolution()
217+
),
211218
new Verifier(new Metrics(new EsqlFunctionRegistry()), new XPackLicenseState(() -> 0L))
212219
);
213220
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5317,7 +5317,13 @@ public void testEmptyMappingIndex() {
53175317
EsIndex empty = new EsIndex("empty_test", emptyMap(), Map.of());
53185318
IndexResolution getIndexResultAirports = IndexResolution.valid(empty);
53195319
var analyzer = new Analyzer(
5320-
new AnalyzerContext(EsqlTestUtils.TEST_CFG, new EsqlFunctionRegistry(), getIndexResultAirports, enrichResolution, defaultInferenceResolution()),
5320+
new AnalyzerContext(
5321+
EsqlTestUtils.TEST_CFG,
5322+
new EsqlFunctionRegistry(),
5323+
getIndexResultAirports,
5324+
enrichResolution,
5325+
defaultInferenceResolution()
5326+
),
53215327
TEST_VERIFIER
53225328
);
53235329

0 commit comments

Comments
 (0)