Skip to content

Commit 0078040

Browse files
authored
Migrate transport version 9119000 (elastic#134473) (elastic#134493)
Migrates the combined versions 9119000, 9112002, 8841064 ES-12334
1 parent 7ab4874 commit 0078040

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ static TransportVersion def(int id) {
200200
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
201201
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62);
202202
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_8_19 = def(8_841_0_63);
203-
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_8_19 = def(8_841_0_64);
204203
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_4 = def(8_841_0_68);
205204
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
206205
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
@@ -325,7 +324,6 @@ static TransportVersion def(int id) {
325324
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
326325
public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00);
327326
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
328-
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
329327
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_4 = def(9_112_0_07);
330328

331329
/*

server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.apache.lucene.search.MultiTermQuery;
1515
import org.apache.lucene.search.Query;
1616
import org.elasticsearch.TransportVersion;
17-
import org.elasticsearch.TransportVersions;
1817
import org.elasticsearch.common.ParsingException;
1918
import org.elasticsearch.common.Strings;
2019
import org.elasticsearch.common.io.stream.StreamInput;
@@ -41,6 +40,7 @@
4140
*/
4241
public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuilder> implements MultiTermQueryBuilder {
4342
public static final String NAME = "wildcard";
43+
private static final TransportVersion ESQL_FIXED_INDEX_LIKE = TransportVersion.fromName("esql_fixed_index_like");
4444

4545
private static final ParseField WILDCARD_FIELD = new ParseField("wildcard");
4646
private static final ParseField VALUE_FIELD = new ParseField("value");
@@ -126,8 +126,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
126126
* Returns true if the Transport version is compatible with ESQL_FIXED_INDEX_LIKE
127127
*/
128128
public static boolean expressionTransportSupported(TransportVersion version) {
129-
return version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1)
130-
|| version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19);
129+
return version.supports(ESQL_FIXED_INDEX_LIKE);
131130
}
132131

133132
@Override
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9119000,9112002,8841064

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanStreamWrapperQueryBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.apache.lucene.search.Query;
1111
import org.elasticsearch.TransportVersion;
12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1413
import org.elasticsearch.common.io.stream.StreamInput;
1514
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -33,6 +32,8 @@ public class PlanStreamWrapperQueryBuilder implements QueryBuilder {
3332
PlanStreamWrapperQueryBuilder::new
3433
);
3534

35+
private static final TransportVersion ESQL_FIXED_INDEX_LIKE = TransportVersion.fromName("esql_fixed_index_like");
36+
3637
private final Configuration configuration;
3738
private final QueryBuilder next;
3839

@@ -55,7 +56,7 @@ public void writeTo(StreamOutput out) throws IOException {
5556

5657
@Override
5758
public TransportVersion getMinimalSupportedVersion() {
58-
return TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1;
59+
return ESQL_FIXED_INDEX_LIKE;
5960
}
6061

6162
@Override

0 commit comments

Comments
 (0)