From 847d56f2b00a31341b622c1afc592ba23301133e Mon Sep 17 00:00:00 2001 From: Dimitris Athanasiou Date: Fri, 9 Jan 2026 14:40:49 +0200 Subject: [PATCH] Remove unused method ElasticInferenceService.translateToChunkedResults (#140442) Removes unused method `translateToChunkedResults` from `ElasticInferenceService`. The method stopped being used by #129922. Also removes an unused logger in `InferencePlugin`. (cherry picked from commit f0d3d9a31f78a0775d28bd405b0b36301694ccc4) --- .../xpack/inference/InferencePlugin.java | 4 ---- .../elastic/ElasticInferenceService.java | 19 ------------------- 2 files changed, 23 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java index af9c34cea1204..5f168166c236d 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java @@ -7,8 +7,6 @@ package org.elasticsearch.xpack.inference; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.apache.lucene.util.SetOnce; import org.elasticsearch.action.support.MappedActionFilter; import org.elasticsearch.client.internal.Client; @@ -209,8 +207,6 @@ public class InferencePlugin extends Plugin ClusterPlugin, PersistentTaskPlugin { - private static final Logger logger = LogManager.getLogger(InferencePlugin.class); - /** * When this setting is true the verification check that * connects to the external service will not be made at diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java index 5f4ae46383455..239633034040f 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java @@ -11,7 +11,6 @@ import org.elasticsearch.TransportVersion; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.Strings; import org.elasticsearch.common.ValidationException; import org.elasticsearch.core.Nullable; import org.elasticsearch.core.TimeValue; @@ -34,10 +33,6 @@ import org.elasticsearch.xpack.core.inference.action.InferenceAction; import org.elasticsearch.xpack.core.inference.chunking.ChunkingSettingsBuilder; import org.elasticsearch.xpack.core.inference.chunking.EmbeddingRequestChunker; -import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceEmbedding; -import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceError; -import org.elasticsearch.xpack.core.inference.results.SparseEmbeddingResults; -import org.elasticsearch.xpack.core.ml.inference.results.ErrorInferenceResults; import org.elasticsearch.xpack.inference.external.http.sender.ChatCompletionInput; import org.elasticsearch.xpack.inference.external.http.sender.EmbeddingsInput; import org.elasticsearch.xpack.inference.external.http.sender.HttpRequestSender; @@ -62,8 +57,6 @@ import java.util.Map; import java.util.Set; -import static org.elasticsearch.inference.InferenceStringGroup.toInferenceStringList; -import static org.elasticsearch.xpack.core.inference.results.ResultUtils.createInvalidChunkedResultException; import static org.elasticsearch.xpack.inference.services.ServiceFields.MAX_INPUT_TOKENS; import static org.elasticsearch.xpack.inference.services.ServiceFields.MODEL_ID; import static org.elasticsearch.xpack.inference.services.ServiceUtils.createInvalidModelException; @@ -515,18 +508,6 @@ public static SimilarityMeasure defaultDenseTextEmbeddingsSimilarity() { return SimilarityMeasure.COSINE; } - private static List translateToChunkedResults(InferenceInputs inputs, InferenceServiceResults inferenceResults) { - if (inferenceResults instanceof SparseEmbeddingResults sparseEmbeddingResults) { - var inputsAsList = toInferenceStringList(inputs.castTo(EmbeddingsInput.class).getInputs()); - return ChunkedInferenceEmbedding.listOf(inputsAsList, sparseEmbeddingResults); - } else if (inferenceResults instanceof ErrorInferenceResults error) { - return List.of(new ChunkedInferenceError(error.getException())); - } else { - String expectedClass = Strings.format("%s", SparseEmbeddingResults.class.getSimpleName()); - throw createInvalidChunkedResultException(expectedClass, inferenceResults.getWriteableName()); - } - } - private TraceContext getCurrentTraceInfo() { var threadPool = getServiceComponents().threadPool();