ESQL: DS: Add inference/RERANK tests (#145229)

bpintea · web-flow · commit b1bfa5b9ae26 · 2026-03-31T14:48:51.000+02:00
This adds tests involving RERANK with inference.
diff --git a/x-pack/plugin/esql-datasource-csv/qa/build.gradle b/x-pack/plugin/esql-datasource-csv/qa/build.gradle
@@ -33,6 +33,7 @@ dependencies {
   clusterModules project(':modules:repository-gcs')
   clusterPlugins project(':plugins:mapper-size')
   clusterPlugins project(':plugins:mapper-murmur3')
+  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
 
   // The CSV datasource plugin under test
   clusterPlugins project(xpackModule('esql-datasource-csv'))
diff --git a/x-pack/plugin/esql-datasource-csv/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/csv/Clusters.java b/x-pack/plugin/esql-datasource-csv/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/csv/Clusters.java
@@ -28,6 +28,7 @@ public static ElasticsearchCluster testCluster(Supplier<String> s3EndpointSuppli
         return ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .shared(true)
+            .plugin("inference-service-test")
             // Enable S3 repository plugin for S3 access
             .module("repository-s3")
             // Enable GCS repository module for GCS access
diff --git a/x-pack/plugin/esql-datasource-iceberg/qa/build.gradle b/x-pack/plugin/esql-datasource-iceberg/qa/build.gradle
@@ -62,7 +62,8 @@ dependencies {
   clusterModules project(':modules:repository-s3')
   clusterPlugins project(':plugins:mapper-size')
   clusterPlugins project(':plugins:mapper-murmur3')
-  
+  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
+
   // The Iceberg datasource plugin under test
   clusterPlugins project(xpackModule('esql-datasource-iceberg'))
   clusterPlugins project(xpackModule('esql-datasource-s3'))
diff --git a/x-pack/plugin/esql-datasource-iceberg/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/iceberg/Clusters.java b/x-pack/plugin/esql-datasource-iceberg/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/iceberg/Clusters.java
@@ -33,6 +33,7 @@ public static ElasticsearchCluster testCluster(Supplier<String> s3EndpointSuppli
         return ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .shared(true)
+            .plugin("inference-service-test")
             // Enable S3 repository plugin for S3 access
             .module("repository-s3")
             // Basic cluster settings
diff --git a/x-pack/plugin/esql-datasource-ndjson/qa/build.gradle b/x-pack/plugin/esql-datasource-ndjson/qa/build.gradle
@@ -33,6 +33,7 @@ dependencies {
   clusterModules project(':modules:repository-gcs')
   clusterPlugins project(':plugins:mapper-size')
   clusterPlugins project(':plugins:mapper-murmur3')
+  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
 
   // The datasource plugin under test
   clusterPlugins project(xpackModule('esql-datasource-ndjson'))
diff --git a/x-pack/plugin/esql-datasource-ndjson/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/ndjson/Clusters.java b/x-pack/plugin/esql-datasource-ndjson/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/ndjson/Clusters.java
@@ -28,6 +28,7 @@ public static ElasticsearchCluster testCluster(Supplier<String> s3EndpointSuppli
         return ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .shared(true)
+            .plugin("inference-service-test")
             // Enable S3 repository plugin for S3 access
             .module("repository-s3")
             // Enable GCS repository module for GCS access
diff --git a/x-pack/plugin/esql-datasource-orc/qa/build.gradle b/x-pack/plugin/esql-datasource-orc/qa/build.gradle
@@ -55,6 +55,7 @@ dependencies {
   clusterModules project(':modules:repository-gcs')
   clusterPlugins project(':plugins:mapper-size')
   clusterPlugins project(':plugins:mapper-murmur3')
+  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
 
   // The ORC datasource plugin under test
   clusterPlugins project(xpackModule('esql-datasource-orc'))
diff --git a/x-pack/plugin/esql-datasource-orc/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/orc/Clusters.java b/x-pack/plugin/esql-datasource-orc/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/orc/Clusters.java
@@ -29,6 +29,7 @@ public static ElasticsearchCluster testCluster(Supplier<String> s3EndpointSuppli
         return ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .shared(true)
+            .plugin("inference-service-test")
             .module("repository-s3")
             .module("repository-gcs")
             .setting("xpack.security.enabled", "false")
diff --git a/x-pack/plugin/esql-datasource-parquet/qa/build.gradle b/x-pack/plugin/esql-datasource-parquet/qa/build.gradle
@@ -39,7 +39,8 @@ dependencies {
   clusterModules project(':modules:repository-gcs')
   clusterPlugins project(':plugins:mapper-size')
   clusterPlugins project(':plugins:mapper-murmur3')
-  
+  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
+
   // The parquet datasource plugin under test
   clusterPlugins project(xpackModule('esql-datasource-parquet'))
   clusterPlugins project(xpackModule('esql-datasource-http'))
diff --git a/x-pack/plugin/esql-datasource-parquet/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/parquet/Clusters.java b/x-pack/plugin/esql-datasource-parquet/qa/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/parquet/Clusters.java
@@ -28,6 +28,7 @@ public static ElasticsearchCluster testCluster(Supplier<String> s3EndpointSuppli
         return ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .shared(true)
+            .plugin("inference-service-test")
             // Enable S3 repository plugin for S3 access
             .module("repository-s3")
             // Enable GCS repository module for GCS access
diff --git a/x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/ExternalDistributedClusters.java b/x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/ExternalDistributedClusters.java
@@ -28,6 +28,7 @@ public class ExternalDistributedClusters {
     static ElasticsearchCluster testCluster(Supplier<String> s3EndpointSupplier) {
         return Clusters.testCluster(spec -> {
             spec.feature(FeatureFlag.ESQL_EXTERNAL_DATASOURCES);
+            spec.plugin("inference-service-test");
             spec.module("repository-s3");
             spec.module("repository-gcs");
             spec.setting("xpack.ml.enabled", "false");
diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/AbstractExternalSourceSpecTestCase.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/AbstractExternalSourceSpecTestCase.java
@@ -10,6 +10,7 @@
 import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.logging.Logger;
 import org.elasticsearch.xpack.esql.CsvSpecReader.CsvTestCase;
+import org.elasticsearch.xpack.esql.CsvTestsDataLoader;
 import org.elasticsearch.xpack.esql.SpecReader;
 import org.elasticsearch.xpack.esql.datasources.AzureFixtureUtils;
 import org.elasticsearch.xpack.esql.datasources.AzureFixtureUtils.DataSourcesAzureHttpFixture;
@@ -400,6 +401,13 @@ protected boolean supportsInferenceTestServiceOnLocalCluster() {
         return false;
     }
 
+    @Override
+    protected void createInferenceEndpointsIfSupported() throws IOException {
+        // Register only RERANK: external-basic.csv-spec uses test_reranker; full INFERENCE_CONFIGS includes task types
+        // not supported on these minimal clusters (e.g. SPARSE_EMBEDDING). Test clusters must load inference-service-test.
+        CsvTestsDataLoader.createInferenceEndpoints(adminClient(), List.of("test_reranker"));
+    }
+
     @Override
     protected boolean supportsSemanticTextInference() {
         return false;
diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java
@@ -177,9 +177,7 @@ public void setup() throws IOException {
         INGEST.protectedBlock(() -> {
             // Inference endpoints must be created before ingesting any datasets that rely on them (mapping of inference_id)
             // If multiple clusters are used, only create endpoints on the local cluster if it supports the inference test service.
-            if (supportsInferenceTestServiceOnLocalCluster()) {
-                createInferenceEndpoints(adminClient());
-            }
+            createInferenceEndpointsIfSupported();
             loadDataSetIntoEs(
                 client(),
                 supportsIndexModeLookup(),
@@ -329,6 +327,16 @@ protected boolean supportsInferenceTestServiceOnLocalCluster() {
         return true;
     }
 
+    /**
+     * Creates inference test endpoints when {@link #supportsInferenceTestServiceOnLocalCluster()} is true.
+     * Subclasses may override to register a subset of endpoints for clusters that do not support all task types.
+     */
+    protected void createInferenceEndpointsIfSupported() throws IOException {
+        if (supportsInferenceTestServiceOnLocalCluster()) {
+            createInferenceEndpoints(adminClient());
+        }
+    }
+
     protected boolean requiresSemanticTextInference() {
         return testCase.requiredCapabilities.contains(SEMANTIC_TEXT_FIELD_CAPS.capabilityName());
     }
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
@@ -43,6 +43,7 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -642,8 +643,16 @@ private static void deleteEnrichPolicies(RestClient client) throws IOException {
     }
 
     public static void createInferenceEndpoints(RestClient client) throws IOException {
-        for (var config : INFERENCE_CONFIGS.values()) {
-            if (hasInferenceEndpoint(client, config) == false) {
+        createInferenceEndpoints(client, INFERENCE_CONFIGS.keySet());
+    }
+
+    /**
+     * Creates only the listed inference endpoints (by id in {@link #INFERENCE_CONFIGS}), skipping any that already exist.
+     */
+    public static void createInferenceEndpoints(RestClient client, Collection<String> inferenceIds) throws IOException {
+        for (String id : inferenceIds) {
+            InferenceConfig config = INFERENCE_CONFIGS.get(id);
+            if (config != null && hasInferenceEndpoint(client, config) == false) {
                 createInferenceEndpoint(client, config);
             }
         }
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/external-basic.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/external-basic.csv-spec
@@ -776,6 +776,25 @@ War and Peace                      | WAR AND PEACE
 War and Peace: A Novel (6 Volumes) | WAR AND PEACE: A NOVEL (6 VOLUMES)
 ;
 
+externalRerankBooks
+required_capability: external_command
+required_capability: rerank
+
+EXTERNAL "{{books}}"
+| WHERE book_no IN ("5327", "9032", "4536", "2776")
+| RERANK "war and peace" ON title WITH { "inference_id" : "test_reranker" }
+| EVAL _score=ROUND(_score, 2)
+| SORT _score DESC, book_no ASC
+| KEEP book_no, title, author, _score
+;
+
+book_no:keyword | title:text                                            | author:text                                 | _score:double
+5327            | War and Peace                                         | Leo Tolstoy                                 | 0.08
+4536            | War and Peace (Signet Classics)                       | [Leo Tolstoy, Pat Conroy, John Hockenberry] | 0.03
+9032            | War and Peace: A Novel (6 Volumes)                    | Tolstoy Leo                                 | 0.03
+2776            | The Devil and Other Stories (Oxford World's Classics) | Leo Tolstoy                                 | 0.02
+;
+
 enrich
 required_capability: external_command
 required_capability: enrich_load
