Skip to content

Commit 525eed2

Browse files
committed
Fix failures introduced by merge
1 parent a2cdc42 commit 525eed2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
import org.elasticsearch.xcontent.XContent;
4747
import org.elasticsearch.xpack.core.XPackField;
4848
import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceError;
49-
import org.elasticsearch.xpack.inference.chunking.ChunkingSettingsBuilder;
5049
import org.elasticsearch.xpack.inference.InferenceException;
50+
import org.elasticsearch.xpack.inference.chunking.ChunkingSettingsBuilder;
5151
import org.elasticsearch.xpack.inference.mapper.SemanticTextField;
5252
import org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper;
5353
import org.elasticsearch.xpack.inference.mapper.SemanticTextUtils;
@@ -318,7 +318,7 @@ public void onFailure(Exception exc) {
318318
return;
319319
}
320320
int currentBatchSize = Math.min(requests.size(), batchSize);
321-
final ChunkingSettings chunkingSettings = requests.getFirst().chunkingSettings;
321+
final ChunkingSettings chunkingSettings = requests.isEmpty() == false ? requests.getFirst().chunkingSettings : null;
322322
final List<FieldInferenceRequest> currentBatch = new ArrayList<>();
323323
for (FieldInferenceRequest request : requests) {
324324
if (Objects.equals(request.chunkingSettings, chunkingSettings) == false || currentBatch.size() >= currentBatchSize) {
@@ -621,7 +621,9 @@ private Map<String, List<FieldInferenceRequest>> createFieldInferenceRequests(Bu
621621
new FieldInferenceResponse(field, sourceField, v, order++, 0, null, EMPTY_CHUNKED_INFERENCE)
622622
);
623623
} else {
624-
fieldRequests.add(new FieldInferenceRequest(itemIndex, field, sourceField, v, order++, offsetAdjustment, chunkingSettings));
624+
fieldRequests.add(
625+
new FieldInferenceRequest(itemIndex, field, sourceField, v, order++, offsetAdjustment, chunkingSettings)
626+
);
625627
}
626628

627629
// When using the inference metadata fields format, all the input values are concatenated so that the

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ public void testHandleEmptyInput() throws Exception {
408408
Task task = mock(Task.class);
409409
Map<String, InferenceFieldMetadata> inferenceFieldMap = Map.of(
410410
"semantic_text_field",
411-
new InferenceFieldMetadata("semantic_text_field", model.getInferenceEntityId(), new String[] { "semantic_text_field" })
411+
new InferenceFieldMetadata("semantic_text_field", model.getInferenceEntityId(), new String[] { "semantic_text_field" }, null)
412412
);
413413

414414
BulkItemRequest[] items = new BulkItemRequest[3];

0 commit comments

Comments
 (0)