[CI] Auto commit changes from spotless

elasticsearchmachine · elasticsearchmachine · commit 7b8fb015453a · 2025-02-20T15:39:42.000Z
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java
@@ -672,7 +672,6 @@ private LogicalPlan resolveCompletion(Completion p, List<Attribute> childrenOutp
                 changed.set(true);
             }
 
-
             if (changed.get() == false) {
                 return p;
             }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/CompletionOperator.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/CompletionOperator.java
@@ -54,7 +54,12 @@ public Operator get(DriverContext driverContext) {
     private final String inferenceId;
     private final EvalOperator.ExpressionEvaluator promptEvaluator;
 
-    public CompletionOperator(DriverContext driverContext, InferenceService inferenceService, String inferenceId, EvalOperator.ExpressionEvaluator promptEvaluator) {
+    public CompletionOperator(
+        DriverContext driverContext,
+        InferenceService inferenceService,
+        String inferenceId,
+        EvalOperator.ExpressionEvaluator promptEvaluator
+    ) {
         super(driverContext, MAX_INFERENCE_WORKER);
         this.blockFactory = driverContext.blockFactory();
         this.inferenceService = inferenceService;
@@ -76,25 +81,22 @@ protected void performAsync(Page inputPage, ActionListener<Page> listener) {
         CountDownLatch countDownLatch = new CountDownLatch(inputPage.getPositionCount());
         BytesRef[] inferredValues = new BytesRef[inputPage.getPositionCount()];
 
-        ActionListener<Tuple<Integer, BytesRef>> inferenceResponseListener = ActionListener.wrap(
-            response -> {
-                countDownLatch.countDown();
-                inferredValues[response.v1()] = response.v2();
-                if (countDownLatch.getCount() == 0) {
-                    BytesRefBlock.Builder inferenceBlock = blockFactory.newBytesRefBlockBuilder(inputPage.getPositionCount());
-
-                    for (BytesRef inferredValue : inferredValues) {
-                        if (inferredValue == null) {
-                            inferenceBlock.appendNull();
-                        } else {
-                            inferenceBlock.appendBytesRef(inferredValue);
-                        }
+        ActionListener<Tuple<Integer, BytesRef>> inferenceResponseListener = ActionListener.wrap(response -> {
+            countDownLatch.countDown();
+            inferredValues[response.v1()] = response.v2();
+            if (countDownLatch.getCount() == 0) {
+                BytesRefBlock.Builder inferenceBlock = blockFactory.newBytesRefBlockBuilder(inputPage.getPositionCount());
+
+                for (BytesRef inferredValue : inferredValues) {
+                    if (inferredValue == null) {
+                        inferenceBlock.appendNull();
+                    } else {
+                        inferenceBlock.appendBytesRef(inferredValue);
                     }
-                    listener.onResponse(inputPage.appendBlock(inferenceBlock.build()));
                 }
-            },
-            listener::onFailure
-        );
+                listener.onResponse(inputPage.appendBlock(inferenceBlock.build()));
+            }
+        }, listener::onFailure);
 
         for (int position = 0; position < inputPage.getPositionCount(); position++) {
             final int currentPosition = position;
@@ -103,10 +105,13 @@ protected void performAsync(Page inputPage, ActionListener<Page> listener) {
                 continue;
             }
 
-            doCompletion(promptBlock.getBytesRef(promptBlock.getFirstValueIndex(position), promptValue).utf8ToString(), ActionListener.wrap(
-                completionResponse -> inferenceResponseListener.onResponse(Tuple.tuple(currentPosition, completionResponse)),
-                listener::onFailure
-            ));
+            doCompletion(
+                promptBlock.getBytesRef(promptBlock.getFirstValueIndex(position), promptValue).utf8ToString(),
+                ActionListener.wrap(
+                    completionResponse -> inferenceResponseListener.onResponse(Tuple.tuple(currentPosition, completionResponse)),
+                    listener::onFailure
+                )
+            );
         }
     }
 
@@ -116,21 +121,16 @@ protected void doClose() {
     }
 
     private void doCompletion(String prompt, ActionListener<BytesRef> listener) {
-        inferenceService.infer(createInferenceRequest(prompt), ActionListener.wrap(
-            inferenceResponse -> {
-                if (inferenceResponse.getResults() instanceof ChatCompletionResults completionResults) {
-                    listener.onResponse(new BytesRef(completionResults.getResults().getFirst().predictedValue().toString()));
-                    return;
-                }
-                listener.onFailure(new Exception("WTF???"));
-            },
-            listener::onFailure
-        ));
+        inferenceService.infer(createInferenceRequest(prompt), ActionListener.wrap(inferenceResponse -> {
+            if (inferenceResponse.getResults() instanceof ChatCompletionResults completionResults) {
+                listener.onResponse(new BytesRef(completionResults.getResults().getFirst().predictedValue().toString()));
+                return;
+            }
+            listener.onFailure(new Exception("WTF???"));
+        }, listener::onFailure));
     }
 
     private InferenceAction.Request createInferenceRequest(String prompt) {
-        return InferenceAction.Request.builder(inferenceId, TaskType.COMPLETION)
-            .setInput(List.of(prompt))
-            .build();
+        return InferenceAction.Request.builder(inferenceId, TaskType.COMPLETION).setInput(List.of(prompt)).build();
     }
 }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/RerankOperator.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/RerankOperator.java
@@ -47,7 +47,6 @@ public record Factory(
         @Override
         public RerankOperator get(DriverContext driverContext) {
 
-
             return new RerankOperator(
                 inferenceService,
                 inferenceId,
@@ -59,14 +58,13 @@ public RerankOperator get(DriverContext driverContext) {
             );
         }
 
-
         private Map<String, EvalOperator.ExpressionEvaluator> buildRerankFieldEvaluator(
             Map<String, EvalOperator.ExpressionEvaluator.Factory> rerankFieldsEvaluatorSuppliers,
             DriverContext driverContext
         ) {
             Map<String, EvalOperator.ExpressionEvaluator> rerankFieldsEvaluators = new HashMap<>();
 
-            for (var entry: rerankFieldsEvaluatorSuppliers.entrySet()) {
+            for (var entry : rerankFieldsEvaluatorSuppliers.entrySet()) {
                 rerankFieldsEvaluators.put(entry.getKey(), entry.getValue().get(driverContext));
             }
 
@@ -181,14 +179,14 @@ private InferenceAction.Request buildInferenceRequest(Page inputPage) throws IOE
         String[] inputs = new String[inputPage.getPositionCount()];
         Map<String, Block> inputBlocks = new HashMap<>();
 
-
-        for (var entry :rerankFieldsEvaluator.entrySet()) {
+        for (var entry : rerankFieldsEvaluator.entrySet()) {
             inputBlocks.put(entry.getKey(), entry.getValue().eval(inputPage));
-        };
+        }
+        ;
 
         for (int pos = 0; pos < inputPage.getPositionCount(); pos++) {
             try (XContentBuilder yamlBuilder = XContentFactory.yamlBuilder().startObject()) {
-                for (var blockEntry: inputBlocks.entrySet()) {
+                for (var blockEntry : inputBlocks.entrySet()) {
                     String fieldName = blockEntry.getKey();
                     Block currentBlock = blockEntry.getValue();
                     if (currentBlock.isNull(pos)) {
@@ -202,7 +200,6 @@ private InferenceAction.Request buildInferenceRequest(Page inputPage) throws IOE
             }
         }
 
-
         return InferenceAction.Request.builder(inferenceId, TaskType.RERANK).setInput(List.of(inputs)).setQuery(queryText).build();
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineLimits.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineLimits.java
@@ -37,7 +37,11 @@ public LogicalPlan rule(Limit limit, LogicalOptimizerContext ctx) {
             var l2 = (int) childLimit.limit().fold(ctx.foldCtx());
             return new Limit(limit.source(), Literal.of(limitSource, Math.min(l1, l2)), childLimit.child());
         } else if (limit.child() instanceof UnaryPlan unary) {
-            if (unary instanceof Eval || unary instanceof Project || unary instanceof RegexExtract || unary instanceof Enrich || unary instanceof Completion) {
+            if (unary instanceof Eval
+                || unary instanceof Project
+                || unary instanceof RegexExtract
+                || unary instanceof Enrich
+                || unary instanceof Completion) {
                 return unary.replaceChild(limit.replaceChild(unary.child()));
             } else if (unary instanceof MvExpand mvx) {
                 // MV_EXPAND can increase the number of rows, so we cannot just push the limit down
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java
@@ -605,8 +605,6 @@ public PlanFactory visitRerankCommand(EsqlBaseParser.RerankCommandContext ctx) {
         );
     }
 
-
-
     @Override
     public PlanFactory visitCompletionCommand(EsqlBaseParser.CompletionCommandContext ctx) {
         Source source = source(ctx);
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/inference/Completion.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/inference/Completion.java
@@ -30,7 +30,11 @@
 
 public class Completion extends InferencePlan implements GeneratingPlan<Completion> {
 
-    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(LogicalPlan.class, "Completion", Completion::new);
+    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
+        LogicalPlan.class,
+        "Completion",
+        Completion::new
+    );
 
     private final Expression prompt;
     private final ReferenceAttribute target;
@@ -58,14 +62,18 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeNamedWriteable(target);
     }
 
-
     @Override
     public Completion withGeneratedNames(List<String> newNames) {
         checkNumberOfNewNames(newNames);
-        return new Completion(source(), child(), inferenceId(), prompt, new ReferenceAttribute(Source.EMPTY, newNames.getFirst(), DataType.KEYWORD));
+        return new Completion(
+            source(),
+            child(),
+            inferenceId(),
+            prompt,
+            new ReferenceAttribute(Source.EMPTY, newNames.getFirst(), DataType.KEYWORD)
+        );
     }
 
-
     public ReferenceAttribute target() {
         return target;
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/inference/Rerank.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/inference/Rerank.java
@@ -79,7 +79,6 @@ public UnaryPlan replaceChild(LogicalPlan newChild) {
         return new Rerank(source(), newChild, inferenceId(), queryText, rerankFields);
     }
 
-
     @Override
     protected AttributeSet computeReferences() {
         return computeReferences(rerankFields);
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/inference/CompletionExec.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/inference/CompletionExec.java
@@ -112,7 +112,9 @@ public boolean equals(Object obj) {
             return false;
         }
         CompletionExec other = ((CompletionExec) obj);
-        return Objects.equals(target, other.target) && Objects.equals(prompt, other.prompt) && Objects.equals(inferenceId, other.inferenceId);
+        return Objects.equals(target, other.target)
+            && Objects.equals(prompt, other.prompt)
+            && Objects.equals(inferenceId, other.inferenceId);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java
@@ -701,8 +701,11 @@ private PhysicalOperation planRerank(RerankExec rerank, LocalExecutionPlannerCon
 
         Map<String, EvalOperator.ExpressionEvaluator.Factory> rerankFieldsEvaluatorSuppliers = new HashMap<>();
 
-        for (var rerankField: rerank.rerankFields()) {
-            rerankFieldsEvaluatorSuppliers.put(rerankField.name(), EvalMapper.toEvaluator(context.foldCtx(), rerankField.child(), source.layout));
+        for (var rerankField : rerank.rerankFields()) {
+            rerankFieldsEvaluatorSuppliers.put(
+                rerankField.name(),
+                EvalMapper.toEvaluator(context.foldCtx(), rerankField.child(), source.layout)
+            );
         }
 
         String inferenceId = rerank.inferenceId();
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/mapper/Mapper.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/mapper/Mapper.java
@@ -229,7 +229,12 @@ private PhysicalPlan mapBinary(BinaryPlan bp) {
     }
 
     public static boolean isPipelineBreaker(LogicalPlan p) {
-        return p instanceof Aggregate || p instanceof TopN || p instanceof Limit || p instanceof OrderBy || p instanceof Rerank || p instanceof Completion;
+        return p instanceof Aggregate
+            || p instanceof TopN
+            || p instanceof Limit
+            || p instanceof OrderBy
+            || p instanceof Rerank
+            || p instanceof Completion;
     }
 
     private PhysicalPlan addExchangeForFragment(LogicalPlan logical, PhysicalPlan child) {

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,6 @@ private LogicalPlan resolveCompletion(Completion p, List<Attribute> childrenOutp`
`672`	`672`	`changed.set(true);`
`673`	`673`	`}`
`674`	`674`
`675`		`-`
`676`	`675`	`if (changed.get() == false) {`
`677`	`676`	`return p;`
`678`	`677`	`}`
Original file line number	Diff line number	Diff line change
`@@ -605,8 +605,6 @@ public PlanFactory visitRerankCommand(EsqlBaseParser.RerankCommandContext ctx) {`
`605`	`605`	`);`
`606`	`606`	`}`
`607`	`607`
`608`		`-`
`609`		`-`
`610`	`608`	`@Override`
`611`	`609`	`public PlanFactory visitCompletionCommand(EsqlBaseParser.CompletionCommandContext ctx) {`
`612`	`610`	`Source source = source(ctx);`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ public UnaryPlan replaceChild(LogicalPlan newChild) {`
`79`	`79`	`return new Rerank(source(), newChild, inferenceId(), queryText, rerankFields);`
`80`	`80`	`}`
`81`	`81`
`82`		`-`
`83`	`82`	`@Override`
`84`	`83`	`protected AttributeSet computeReferences() {`
`85`	`84`	`return computeReferences(rerankFields);`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,9 @@ public boolean equals(Object obj) {`
`112`	`112`	`return false;`
`113`	`113`	`}`
`114`	`114`	`CompletionExec other = ((CompletionExec) obj);`
`115`		`- return Objects.equals(target, other.target) && Objects.equals(prompt, other.prompt) && Objects.equals(inferenceId, other.inferenceId);`
	`115`	`+ return Objects.equals(target, other.target)`
	`116`	`+ && Objects.equals(prompt, other.prompt)`
	`117`	`+ && Objects.equals(inferenceId, other.inferenceId);`
`116`	`118`	`}`
`117`	`119`
`118`	`120`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,12 @@ private PhysicalPlan mapBinary(BinaryPlan bp) {`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`public static boolean isPipelineBreaker(LogicalPlan p) {`
`232`		`- return p instanceof Aggregate \|\| p instanceof TopN \|\| p instanceof Limit \|\| p instanceof OrderBy \|\| p instanceof Rerank \|\| p instanceof Completion;`
	`232`	`+ return p instanceof Aggregate`
	`233`	`+ \|\| p instanceof TopN`
	`234`	`+ \|\| p instanceof Limit`
	`235`	`+ \|\| p instanceof OrderBy`
	`236`	`+ \|\| p instanceof Rerank`
	`237`	`+ \|\| p instanceof Completion;`
`233`	`238`	`}`
`234`	`239`
`235`	`240`	`private PhysicalPlan addExchangeForFragment(LogicalPlan logical, PhysicalPlan child) {`