Skip to content

Commit cb594a6

Browse files
committed
Lint
1 parent 30159c5 commit cb594a6

File tree

4 files changed

+22
-12
lines changed

4 files changed

+22
-12
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/InferenceOperator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ public Page getOutput() {
5656

5757
@Override
5858
protected void performAsync(Page input, ActionListener<Page> listener) {
59-
try (BulkInferenceRequestIterator requests = requests(input); BulkInferenceOutputBuilder<IR, Page> outputBuilder = outputBuilder(input)) {
59+
try (
60+
BulkInferenceRequestIterator requests = requests(input);
61+
BulkInferenceOutputBuilder<IR, Page> outputBuilder = outputBuilder(input)
62+
) {
6063
bulkInferenceExecutor.execute(requests, outputBuilder, listener);
6164
} catch (Exception e) {
6265
listener.onFailure(e);

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/bulk/BulkInferenceExecutor.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,28 @@
2222

2323
import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
2424

25-
public class BulkInferenceExecutor <IR extends InferenceServiceResults, OutputType>{
25+
public class BulkInferenceExecutor<IR extends InferenceServiceResults, OutputType> {
2626
private static final String TASK_RUNNER_NAME = "bulk_inference_operation";
2727
private final ThrottledInferenceRunner throttledInferenceRunner;
2828

2929
public BulkInferenceExecutor(InferenceRunner inferenceRunner, ThreadPool threadPool, BulkInferenceExecutionConfig bulkExecutionConfig) {
3030
throttledInferenceRunner = ThrottledInferenceRunner.create(inferenceRunner, threadPool, bulkExecutionConfig);
3131
}
3232

33-
public void execute(BulkInferenceRequestIterator requests, BulkInferenceOutputBuilder<IR, OutputType> outputBuilder, ActionListener<OutputType> listener) {
33+
public void execute(
34+
BulkInferenceRequestIterator requests,
35+
BulkInferenceOutputBuilder<IR, OutputType> outputBuilder,
36+
ActionListener<OutputType> listener
37+
) {
3438
try {
3539
listener.onResponse(doExecute(requests, outputBuilder));
3640
} catch (Exception e) {
3741
listener.onFailure(e);
3842
}
3943
}
4044

41-
public OutputType doExecute(BulkInferenceRequestIterator requests, BulkInferenceOutputBuilder<IR, OutputType> outputBuilder) throws Exception {
45+
public OutputType doExecute(BulkInferenceRequestIterator requests, BulkInferenceOutputBuilder<IR, OutputType> outputBuilder)
46+
throws Exception {
4247
final BulkInferenceExecutionState bulkExecutionState = new BulkInferenceExecutionState();
4348

4449
if (requests.hasNext()) {
@@ -57,8 +62,8 @@ private Consumer<InferenceAction.Response> inferenceResultPersister(BulkInferenc
5762
return inferenceResponse -> {
5863
InferenceServiceResults results = inferenceResponse.getResults();
5964
if (outputBuilder.inferenceResultsClass().isInstance(results)) {
60-
outputBuilder.addInferenceResults(outputBuilder.inferenceResultsClass().cast(results));
61-
return;
65+
outputBuilder.addInferenceResults(outputBuilder.inferenceResultsClass().cast(results));
66+
return;
6267
}
6368

6469
throw new IllegalStateException(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/completion/CompletionOperatorOutputBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.compute.data.Page;
1414
import org.elasticsearch.core.Releasables;
1515
import org.elasticsearch.xpack.core.inference.results.ChatCompletionResults;
16-
import org.elasticsearch.xpack.esql.inference.InferenceOperator;
1716
import org.elasticsearch.xpack.esql.inference.bulk.BulkInferenceOutputBuilder;
1817

1918
import java.util.concurrent.atomic.AtomicBoolean;

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/inference/bulk/BulkInferenceExecutorTests.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,14 @@ public void testSuccessfulExecution() throws Exception {
8989
assertBusy(() -> {
9090
verify(listener).onResponse(any());
9191
verify(listener, never()).onFailure(any());
92-
assertThat(output.get(), allOf(
93-
notNullValue(),
94-
hasSize(requests.size()),
95-
contains(responses.stream().map(InferenceAction.Response::getResults).toArray())
96-
));
92+
assertThat(
93+
output.get(),
94+
allOf(
95+
notNullValue(),
96+
hasSize(requests.size()),
97+
contains(responses.stream().map(InferenceAction.Response::getResults).toArray())
98+
)
99+
);
97100
});
98101
}
99102

0 commit comments

Comments
 (0)