From 22a7b5ea1292a822f4626ba7ee45bcccb8784f92 Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Wed, 5 Mar 2025 15:18:01 +0000 Subject: [PATCH] Collapse transport versions for 8.17.0 (#124005) --- .../org/elasticsearch/TransportVersions.java | 26 +------------------ .../admin/cluster/node/info/NodeInfo.java | 6 ++--- .../admin/cluster/stats/MappingStats.java | 3 +-- .../indices/stats/IndicesStatsResponse.java | 20 ++------------ .../action/bulk/SimulateBulkRequest.java | 4 +-- .../action/index/IndexRequest.java | 4 +-- .../action/support/IndicesOptions.java | 4 +-- .../org/elasticsearch/index/IndexMode.java | 2 +- .../ingest/PipelineConfiguration.java | 4 +-- .../org/elasticsearch/monitor/os/OsStats.java | 8 +++--- .../search/builder/SearchSourceBuilder.java | 6 ++--- .../application/LogsDBFeatureSetUsage.java | 10 +++---- .../action/GetInferenceModelAction.java | 6 ++--- .../permission/RemoteClusterPermissions.java | 3 +-- .../security/authc/AuthenticationTests.java | 2 +- .../RemoteClusterPermissionsTests.java | 2 +- .../deprecation/DeprecationInfoAction.java | 6 ++--- .../rules/QueryRulesetListItem.java | 6 ++--- .../rules/retriever/RuleQueryRankDoc.java | 2 +- ...setsActionResponseBWCSerializingTests.java | 2 +- .../esql/core/expression/FieldAttribute.java | 4 +-- .../xpack/esql/action/EsqlExecutionInfo.java | 4 +-- .../esql/enrich/EnrichLookupService.java | 4 +-- .../esql/enrich/LookupFromIndexService.java | 4 +-- .../GoogleVertexAiEmbeddingsTaskSettings.java | 6 ++--- ...leVertexAiEmbeddingsTaskSettingsTests.java | 2 +- 26 files changed, 48 insertions(+), 102 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index 9d521ffc1503..c5cbf22fcc76 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -103,31 +103,7 @@ public class TransportVersions { public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_6 = def(8_772_0_06); public static final TransportVersion REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_773_0_00); public static final TransportVersion REVERT_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_774_0_00); - public static final TransportVersion ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED = def(8_775_0_00); - public static final TransportVersion INFERENCE_DONT_PERSIST_ON_READ = def(8_776_0_00); - public static final TransportVersion SIMULATE_MAPPING_ADDITION = def(8_777_0_00); - public static final TransportVersion INTRODUCE_ALL_APPLICABLE_SELECTOR = def(8_778_0_00); - public static final TransportVersion INDEX_MODE_LOOKUP = def(8_779_0_00); - public static final TransportVersion INDEX_REQUEST_REMOVE_METERING = def(8_780_0_00); - public static final TransportVersion CPU_STAT_STRING_PARSING = def(8_781_0_00); - public static final TransportVersion QUERY_RULES_RETRIEVER = def(8_782_0_00); - public static final TransportVersion ESQL_CCS_EXEC_INFO_WITH_FAILURES = def(8_783_0_00); - public static final TransportVersion LOGSDB_TELEMETRY = def(8_784_0_00); - public static final TransportVersion LOGSDB_TELEMETRY_STATS = def(8_785_0_00); - public static final TransportVersion KQL_QUERY_ADDED = def(8_786_0_00); - public static final TransportVersion ROLE_MONITOR_STATS = def(8_787_0_00); - public static final TransportVersion DATA_STREAM_INDEX_VERSION_DEPRECATION_CHECK = def(8_788_0_00); - public static final TransportVersion ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO = def(8_789_0_00); - public static final TransportVersion VERTEX_AI_INPUT_TYPE_ADDED = def(8_790_0_00); - public static final TransportVersion SKIP_INNER_HITS_SEARCH_SOURCE = def(8_791_0_00); - public static final TransportVersion QUERY_RULES_LIST_INCLUDES_TYPES = def(8_792_0_00); - public static final TransportVersion INDEX_STATS_ADDITIONAL_FIELDS = def(8_793_0_00); - public static final TransportVersion INDEX_STATS_ADDITIONAL_FIELDS_REVERT = def(8_794_0_00); - public static final TransportVersion FAST_REFRESH_RCO_2 = def(8_795_0_00); - public static final TransportVersion ESQL_ENRICH_RUNTIME_WARNINGS = def(8_796_0_00); - public static final TransportVersion INGEST_PIPELINE_CONFIGURATION_AS_MAP = def(8_797_0_00); - public static final TransportVersion LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE_FIX_8_17 = def(8_797_0_01); - public static final TransportVersion SOURCE_MODE_TELEMETRY_FIX_8_17 = def(8_797_0_02); + public static final TransportVersion V_8_17_0 = def(8_797_0_02); public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_3 = def(8_797_0_03); public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_4 = def(8_797_0_04); public static final TransportVersion INDEXING_PRESSURE_THROTTLING_STATS = def(8_798_0_00); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java index bde7ae597184..e52b29438999 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java @@ -66,8 +66,7 @@ public class NodeInfo extends BaseNodeResponse { super(in); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { version = in.readString(); - if (in.getTransportVersion().isPatchFrom(TransportVersions.V_8_16_1) - || in.getTransportVersion().onOrAfter(TransportVersions.ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO)) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) { compatibilityVersions = CompatibilityVersions.readVersion(in); } else { compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions @@ -252,8 +251,7 @@ public class NodeInfo extends BaseNodeResponse { } else { Version.writeVersion(Version.fromString(version), out); } - if (out.getTransportVersion().isPatchFrom(TransportVersions.V_8_16_1) - || out.getTransportVersion().onOrAfter(TransportVersions.ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO)) { + if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) { compatibilityVersions.writeTo(out); } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java index 02b581ecbdda..686d432b01a2 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java @@ -291,8 +291,7 @@ public final class MappingStats implements ToXContentFragment, Writeable { } private static boolean canReadOrWriteSourceModeTelemetry(TransportVersion version) { - return version.isPatchFrom(TransportVersions.SOURCE_MODE_TELEMETRY_FIX_8_17) - || version.onOrAfter(TransportVersions.SOURCE_MODE_TELEMETRY); + return version.isPatchFrom(TransportVersions.V_8_17_0) || version.onOrAfter(TransportVersions.SOURCE_MODE_TELEMETRY); } private static OptionalLong ofNullable(Long l) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java index 0b1cc98f07b4..43dcdf220e6d 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java @@ -55,15 +55,7 @@ public class IndicesStatsResponse extends ChunkedBroadcastResponse { IndicesStatsResponse(StreamInput in) throws IOException { super(in); shards = in.readArray(ShardStats::new, ShardStats[]::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS_REVERT)) { - indexHealthMap = in.readMap(ClusterHealthStatus::readFrom); - indexStateMap = in.readMap(IndexMetadata.State::readFrom); - } else if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS)) { - indexHealthMap = in.readMap(ClusterHealthStatus::readFrom); - indexStateMap = in.readMap(IndexMetadata.State::readFrom); - in.readMap(StreamInput::readStringCollectionAsList); // unused, reverted - in.readMap(StreamInput::readLong); // unused, reverted - } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { // Between 8.1 and INDEX_STATS_ADDITIONAL_FIELDS, we had a different format for the response // where we only had health and state available. indexHealthMap = in.readMap(ClusterHealthStatus::readFrom); @@ -186,15 +178,7 @@ public class IndicesStatsResponse extends ChunkedBroadcastResponse { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeArray(shards); - if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS_REVERT)) { - out.writeMap(indexHealthMap, StreamOutput::writeWriteable); - out.writeMap(indexStateMap, StreamOutput::writeWriteable); - } else if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS)) { - out.writeMap(indexHealthMap, StreamOutput::writeWriteable); - out.writeMap(indexStateMap, StreamOutput::writeWriteable); - out.writeMap(Map.of(), StreamOutput::writeStringCollection); - out.writeMap(Map.of(), StreamOutput::writeLong); - } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { + if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { out.writeMap(indexHealthMap, StreamOutput::writeWriteable); out.writeMap(indexStateMap, StreamOutput::writeWriteable); } diff --git a/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java index 290d342e9dc1..60485047e70a 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java @@ -142,7 +142,7 @@ public class SimulateBulkRequest extends BulkRequest { componentTemplateSubstitutions = Map.of(); indexTemplateSubstitutions = Map.of(); } - if (in.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_MAPPING_ADDITION)) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { this.mappingAddition = (Map) in.readGenericValue(); } else { mappingAddition = Map.of(); @@ -157,7 +157,7 @@ public class SimulateBulkRequest extends BulkRequest { out.writeGenericValue(componentTemplateSubstitutions); out.writeGenericValue(indexTemplateSubstitutions); } - if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_MAPPING_ADDITION)) { + if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { out.writeGenericValue(mappingAddition); } } diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java index 4ed38ba16b60..b2a02dce403a 100644 --- a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java @@ -203,7 +203,7 @@ public class IndexRequest extends ReplicatedWriteRequest implement requireDataStream = false; } - if (in.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_METERING)) { + if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) { if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { in.readZLong(); // obsolete normalisedBytesParsed } @@ -803,7 +803,7 @@ public class IndexRequest extends ReplicatedWriteRequest implement out.writeBoolean(requireDataStream); } - if (out.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_METERING)) { + if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) { if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { out.writeZLong(-1); // obsolete normalisedBytesParsed } diff --git a/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java b/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java index b300fc647a18..ae55c3f55250 100644 --- a/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java +++ b/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java @@ -911,7 +911,7 @@ public record IndicesOptions( } if (out.getTransportVersion() .between(TransportVersions.V_8_16_0, TransportVersions.REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX)) { - if (out.getTransportVersion().before(TransportVersions.INTRODUCE_ALL_APPLICABLE_SELECTOR)) { + if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) { out.writeVInt(1); // Enum set sized 1 out.writeVInt(0); // ordinal 0 (::data selector) } else { @@ -955,7 +955,7 @@ public record IndicesOptions( if (in.getTransportVersion() .between(TransportVersions.V_8_16_0, TransportVersions.REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX)) { // Reading from an older node, which will be sending either an enum set or a single byte that needs to be read out and ignored. - if (in.getTransportVersion().before(TransportVersions.INTRODUCE_ALL_APPLICABLE_SELECTOR)) { + if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) { int size = in.readVInt(); for (int i = 0; i < size; i++) { in.readVInt(); diff --git a/server/src/main/java/org/elasticsearch/index/IndexMode.java b/server/src/main/java/org/elasticsearch/index/IndexMode.java index a4708f93335c..2be1c6fc41d9 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexMode.java +++ b/server/src/main/java/org/elasticsearch/index/IndexMode.java @@ -587,7 +587,7 @@ public enum IndexMode { case STANDARD -> 0; case TIME_SERIES -> 1; case LOGSDB -> 2; - case LOOKUP -> out.getTransportVersion().onOrAfter(TransportVersions.INDEX_MODE_LOOKUP) ? 3 : 0; + case LOOKUP -> out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0) ? 3 : 0; }; out.writeByte((byte) code); } diff --git a/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java b/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java index f628130983a3..d258eeb9ed05 100644 --- a/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java +++ b/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java @@ -168,7 +168,7 @@ public final class PipelineConfiguration implements SimpleDiffable config; - if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_PIPELINE_CONFIGURATION_AS_MAP)) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { config = in.readGenericMap(); } else { final BytesReference bytes = in.readSlicedBytesReference(); @@ -190,7 +190,7 @@ public final class PipelineConfiguration implements SimpleDiffable in.readEnum(QueryRule.QueryRuleType.class), StreamInput::readInt); } else { this.ruleTypeToCountMap = Map.of(); @@ -103,8 +102,7 @@ public class QueryRulesetListItem implements Writeable, ToXContentObject { out.writeMap(criteriaTypeToCountMap, StreamOutput::writeEnum, StreamOutput::writeInt); } TransportVersion streamTransportVersion = out.getTransportVersion(); - if (streamTransportVersion.isPatchFrom(TransportVersions.V_8_16_1) - || streamTransportVersion.onOrAfter(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES)) { + if (streamTransportVersion.onOrAfter(TransportVersions.V_8_16_1)) { out.writeMap(ruleTypeToCountMap, StreamOutput::writeEnum, StreamOutput::writeInt); } } diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/RuleQueryRankDoc.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/RuleQueryRankDoc.java index 59f3d9aed31c..aa9d06a62b6c 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/RuleQueryRankDoc.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/RuleQueryRankDoc.java @@ -121,6 +121,6 @@ public class RuleQueryRankDoc extends RankDoc { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.QUERY_RULES_RETRIEVER; + return TransportVersions.V_8_17_0; } } diff --git a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java index e1243b782f73..7f22866de441 100644 --- a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java +++ b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java @@ -59,7 +59,7 @@ public class ListQueryRulesetsActionResponseBWCSerializingTests extends Abstract ListQueryRulesetsAction.Response instance, TransportVersion version ) { - if (version.isPatchFrom(TransportVersions.V_8_16_1) || version.onOrAfter(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES)) { + if (version.onOrAfter(TransportVersions.V_8_16_1)) { return instance; } else if (version.onOrAfter(QueryRulesetListItem.EXPANDED_RULESET_COUNT_TRANSPORT_VERSION)) { List updatedResults = new ArrayList<>(); diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java index d7ae438bc318..0f29c9b1da06 100644 --- a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java +++ b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java @@ -148,7 +148,7 @@ public class FieldAttribute extends TypedAttribute { } private void writeParentName(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED)) { + if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { ((PlanStreamOutput) out).writeOptionalCachedString(parentName); } else { // Previous versions only used the parent field attribute to retrieve the parent's name, so we can use just any @@ -159,7 +159,7 @@ public class FieldAttribute extends TypedAttribute { } private static String readParentName(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED)) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { return ((PlanStreamInput) in).readOptionalCachedString(); } diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlExecutionInfo.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlExecutionInfo.java index 76a790b25c8d..ba986403a835 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlExecutionInfo.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlExecutionInfo.java @@ -424,7 +424,7 @@ public class EsqlExecutionInfo implements ChunkedToXContentObject, Writeable { this.failedShards = in.readOptionalInt(); this.took = in.readOptionalTimeValue(); this.skipUnavailable = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_EXEC_INFO_WITH_FAILURES)) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { this.failures = Collections.unmodifiableList(in.readCollectionAsList(ShardSearchFailure::readShardSearchFailure)); } else { this.failures = Collections.emptyList(); @@ -442,7 +442,7 @@ public class EsqlExecutionInfo implements ChunkedToXContentObject, Writeable { out.writeOptionalInt(failedShards); out.writeOptionalTimeValue(took); out.writeBoolean(skipUnavailable); - if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_EXEC_INFO_WITH_FAILURES)) { + if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { out.writeCollection(failures); } } diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichLookupService.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichLookupService.java index 1dc18c090c1d..67783c2556cd 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichLookupService.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichLookupService.java @@ -211,7 +211,7 @@ public class EnrichLookupService extends AbstractLookupService extractFields = planIn.readNamedWriteableCollectionAsList(NamedExpression.class); var source = Source.EMPTY; - if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_ENRICH_RUNTIME_WARNINGS)) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { source = Source.readFrom(planIn); } TransportRequest result = new TransportRequest( @@ -242,7 +242,7 @@ public class EnrichLookupService extends AbstractLookupService extractFields = planIn.readNamedWriteableCollectionAsList(NamedExpression.class); String matchField = in.readString(); var source = Source.EMPTY; - if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_ENRICH_RUNTIME_WARNINGS)) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { source = Source.readFrom(planIn); } // Source.readFrom() requires the query from the Configuration passed to PlanStreamInput. @@ -182,7 +182,7 @@ public class LookupFromIndexService extends AbstractLookupService