diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index 90397f7513e60..64f185a450dca 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -326,7 +326,6 @@ static TransportVersion def(int id) { public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00); public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01); public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02); - public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS_9_1 = def(9_112_0_03); public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_4 = def(9_112_0_07); /* diff --git a/server/src/main/resources/transport/definitions/referable/esql_sample_operator_status.csv b/server/src/main/resources/transport/definitions/referable/esql_sample_operator_status.csv new file mode 100644 index 0000000000000..ba187a5040aea --- /dev/null +++ b/server/src/main/resources/transport/definitions/referable/esql_sample_operator_status.csv @@ -0,0 +1 @@ +9127000,9112003 diff --git a/server/src/main/resources/transport/upper_bounds/9.2.csv b/server/src/main/resources/transport/upper_bounds/9.2.csv new file mode 100644 index 0000000000000..f7e1e0e42836d --- /dev/null +++ b/server/src/main/resources/transport/upper_bounds/9.2.csv @@ -0,0 +1 @@ +esql_sample_operator_status,9127000 diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/SampleOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/SampleOperator.java index 47d0be6c314e5..f10709c793636 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/SampleOperator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/SampleOperator.java @@ -8,7 +8,6 @@ package org.elasticsearch.compute.operator; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Randomness; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -177,6 +176,8 @@ public record Status(long collectNanos, long emitNanos, int pagesProcessed, long Status::new ); + private static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS = TransportVersion.fromName("esql_sample_operator_status"); + Status(StreamInput streamInput) throws IOException { this( streamInput.readVLong(), @@ -248,7 +249,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return version.onOrAfter(TransportVersions.ESQL_SAMPLE_OPERATOR_STATUS_9_1); + return version.supports(ESQL_SAMPLE_OPERATOR_STATUS); } } }