From a3dac7434b4d1d3938107b85416fea55cc24dc3b Mon Sep 17 00:00:00 2001
From: Jan Kuipers <148754765+jan-elastic@users.noreply.github.com>
Date: Mon, 23 Jun 2025 15:28:14 +0200
Subject: [PATCH] TransportVersion for backporting ES|QL sample (#129831)

---
 .../java/org/elasticsearch/TransportVersions.java    |  1 +
 .../sampler/random/RandomSamplingQueryBuilder.java   | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
index b949cb62f6a0..78aa977c3342 100644
--- a/server/src/main/java/org/elasticsearch/TransportVersions.java
+++ b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -201,6 +201,7 @@ public class TransportVersions {
     public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_BATCH_SIZE_8_19 = def(8_841_0_53);
     public static final TransportVersion STREAMS_LOGS_SUPPORT_8_19 = def(8_841_0_54);
     public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE_8_19 = def(8_841_0_55);
+    public static final TransportVersion RANDOM_SAMPLER_QUERY_BUILDER_8_19 = def(8_841_0_56);
 
     public static final TransportVersion V_9_0_0 = def(9_000_0_09);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/RandomSamplingQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/RandomSamplingQueryBuilder.java
index c59a70753fad..681efdaeb9e3 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/RandomSamplingQueryBuilder.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/RandomSamplingQueryBuilder.java
@@ -139,11 +139,15 @@ public class RandomSamplingQueryBuilder extends AbstractQueryBuilder<RandomSampl
         return NAME;
     }
 
-    /**
-     * The minimal version of the recipient this object can be sent to
-     */
+    @Override
+    public boolean supportsVersion(TransportVersion version) {
+        return version.onOrAfter(TransportVersions.RANDOM_SAMPLER_QUERY_BUILDER)
+            || version.isPatchFrom(TransportVersions.RANDOM_SAMPLER_QUERY_BUILDER_8_19);
+    }
+
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.RANDOM_SAMPLER_QUERY_BUILDER;
+        assert false : "must not be called when overriding supportsVersion";
+        throw new UnsupportedOperationException("must not be called when overriding supportsVersion");
     }
 }