Skip to content

Commit 88a63a8

Browse files
committed
Code improvement.
1 parent 1d486b6 commit 88a63a8

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ public abstract class InferenceOperator extends AsyncOperator<InferenceOperator.
2828
private static final int MAX_INFERENCE_WORKER = 10;
2929
private final String inferenceId;
3030
private final BlockFactory blockFactory;
31-
31+
private final BulkInferenceExecutionConfig bulkExecutionConfig;
3232
private final BulkInferenceExecutor bulkInferenceExecutor;
3333

34-
public InferenceOperator(DriverContext driverContext, InferenceRunner inferenceRunner, ThreadPool threadPool, String inferenceId) {
34+
public InferenceOperator(DriverContext driverContext, InferenceRunner inferenceRunner, BulkInferenceExecutionConfig bulkExecutionConfig, ThreadPool threadPool, String inferenceId) {
3535
super(driverContext, threadPool.getThreadContext(), MAX_INFERENCE_WORKER);
3636
this.blockFactory = driverContext.blockFactory();
37-
this.bulkInferenceExecutor = new BulkInferenceExecutor(inferenceRunner, threadPool, bulkExecutionConfig());
37+
this.bulkExecutionConfig = bulkExecutionConfig;
38+
this.bulkInferenceExecutor = new BulkInferenceExecutor(inferenceRunner, threadPool, bulkExecutionConfig);
3839
this.inferenceId = inferenceId;
3940
}
4041

@@ -78,7 +79,7 @@ protected void performAsync(Page input, ActionListener<OngoingInference> listene
7879
}
7980

8081
protected BulkInferenceExecutionConfig bulkExecutionConfig() {
81-
return BulkInferenceExecutionConfig.DEFAULT;
82+
return bulkExecutionConfig;
8283
}
8384

8485
protected abstract BulkInferenceRequestIterator requests(Page input);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.threadpool.ThreadPool;
1616
import org.elasticsearch.xpack.esql.inference.InferenceOperator;
1717
import org.elasticsearch.xpack.esql.inference.InferenceRunner;
18+
import org.elasticsearch.xpack.esql.inference.bulk.BulkInferenceExecutionConfig;
1819
import org.elasticsearch.xpack.esql.inference.bulk.BulkInferenceRequestIterator;
1920

2021
public class CompletionOperator extends InferenceOperator {
@@ -48,7 +49,7 @@ public CompletionOperator(
4849
String inferenceId,
4950
ExpressionEvaluator promptEvaluator
5051
) {
51-
super(driverContext, inferenceRunner, threadPool, inferenceId);
52+
super(driverContext, inferenceRunner, BulkInferenceExecutionConfig.DEFAULT, threadPool, inferenceId);
5253
this.promptEvaluator = promptEvaluator;
5354
}
5455

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.threadpool.ThreadPool;
1616
import org.elasticsearch.xpack.esql.inference.InferenceOperator;
1717
import org.elasticsearch.xpack.esql.inference.InferenceRunner;
18+
import org.elasticsearch.xpack.esql.inference.bulk.BulkInferenceExecutionConfig;
1819

1920
public class RerankOperator extends InferenceOperator {
2021
public record Factory(
@@ -61,7 +62,7 @@ public RerankOperator(
6162
ExpressionEvaluator rowEncoder,
6263
int scoreChannel
6364
) {
64-
super(driverContext, inferenceRunner, threadPool, inferenceId);
65+
super(driverContext, inferenceRunner, BulkInferenceExecutionConfig.DEFAULT, threadPool, inferenceId);
6566
this.queryText = queryText;
6667
this.rowEncoder = rowEncoder;
6768
this.scoreChannel = scoreChannel;

0 commit comments

Comments
 (0)