diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index e5a8012f45c38..ec174fcd9ad1e 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -334,7 +334,6 @@ static TransportVersion def(int id) { public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00); public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00); 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_1 = def(9_112_0_04); public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_2 = def(9_112_0_05); public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_3 = def(9_112_0_06); @@ -352,7 +351,6 @@ static TransportVersion def(int id) { public static final TransportVersion PROJECT_STATE_REGISTRY_ENTRY = def(9_124_0_00); public static final TransportVersion ML_INFERENCE_LLAMA_ADDED = def(9_125_0_00); public static final TransportVersion SHARD_WRITE_LOAD_IN_CLUSTER_INFO = def(9_126_0_00); - public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS = def(9_127_0_00); public static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = def(9_147_0_00); public static final TransportVersion STREAMS_ENDPOINT_PARAM_RESTRICTIONS = def(9_148_0_00); 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.1.csv b/server/src/main/resources/transport/upper_bounds/9.1.csv index 19c743726530c..fc2e2273c9855 100644 --- a/server/src/main/resources/transport/upper_bounds/9.1.csv +++ b/server/src/main/resources/transport/upper_bounds/9.1.csv @@ -1 +1 @@ -esql_split_on_big_values,9112001 +esql_sample_operator_status,9112003 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 1395a0d0ad73c..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,8 +249,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return version.onOrAfter(TransportVersions.ESQL_SAMPLE_OPERATOR_STATUS) - || version.isPatchFrom(TransportVersions.ESQL_SAMPLE_OPERATOR_STATUS_9_1); + return version.supports(ESQL_SAMPLE_OPERATOR_STATUS); } } }