Skip to content

Commit a1ef7d5

Browse files
ES|QL: Make LOOKUP JOIN on aliases compatible with 8.19 (#128835)
1 parent 092d4ba commit a1ef7d5

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ static TransportVersion def(int id) {
187187
public static final TransportVersion INFERENCE_CUSTOM_SERVICE_ADDED_8_19 = def(8_841_0_39);
188188
public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ADDED_8_19 = def(8_841_0_40);
189189
public static final TransportVersion DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS_8_19 = def(8_841_0_41);
190+
public static final TransportVersion JOIN_ON_ALIASES_8_19 = def(8_841_0_42);
190191
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
191192
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
192193
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/LookupFromIndexService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ static TransportRequest readFrom(StreamInput in, BlockFactory blockFactory) thro
153153
ShardId shardId = new ShardId(in);
154154

155155
String indexPattern;
156-
if (in.getTransportVersion().onOrAfter(TransportVersions.JOIN_ON_ALIASES)) {
156+
if (in.getTransportVersion().onOrAfter(TransportVersions.JOIN_ON_ALIASES)
157+
|| in.getTransportVersion().isPatchFrom(TransportVersions.JOIN_ON_ALIASES_8_19)) {
157158
indexPattern = in.readString();
158159
} else {
159160
indexPattern = shardId.getIndexName();
@@ -198,7 +199,8 @@ public void writeTo(StreamOutput out) throws IOException {
198199
out.writeString(sessionId);
199200
out.writeWriteable(shardId);
200201

201-
if (out.getTransportVersion().onOrAfter(TransportVersions.JOIN_ON_ALIASES)) {
202+
if (out.getTransportVersion().onOrAfter(TransportVersions.JOIN_ON_ALIASES)
203+
|| out.getTransportVersion().isPatchFrom(TransportVersions.JOIN_ON_ALIASES_8_19)) {
202204
out.writeString(indexPattern);
203205
} else if (indexPattern.equals(shardId.getIndexName()) == false) {
204206
throw new EsqlIllegalArgumentException("Aliases and index patterns are not allowed for LOOKUP JOIN []", indexPattern);

0 commit comments

Comments
 (0)