Skip to content

Commit 9824ffd

Browse files
authored
[8.19] Migrate transport version 9119000 (elastic#134473) (elastic#134496)
* Migrate transport version 9119000 (elastic#134473) Migrates the combined versions 9119000, 9112002, 8841064 ES-12334 * add missing upper bounds files
1 parent 5e30504 commit 9824ffd

File tree

6 files changed

+8
-4
lines changed

6 files changed

+8
-4
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ static TransportVersion def(int id) {
241241
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
242242
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62);
243243
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_8_19 = def(8_841_0_63);
244-
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_8_19 = def(8_841_0_64);
245244
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_4 = def(8_841_0_68);
246245

247246
/*

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
*/
4242
public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuilder> implements MultiTermQueryBuilder {
4343
public static final String NAME = "wildcard";
44+
private static final TransportVersion ESQL_FIXED_INDEX_LIKE = TransportVersion.fromName("esql_fixed_index_like");
4445

4546
private static final ParseField WILDCARD_FIELD = new ParseField("wildcard");
4647
private static final ParseField VALUE_FIELD = new ParseField("value");
@@ -130,7 +131,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
130131
* Returns true if the Transport version is compatible with ESQL_FIXED_INDEX_LIKE
131132
*/
132133
public static boolean expressionTransportSupported(TransportVersion version) {
133-
return version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19);
134+
return version.supports(ESQL_FIXED_INDEX_LIKE);
134135
}
135136

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

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;
@@ -31,6 +30,8 @@ public class PlanStreamWrapperQueryBuilder implements QueryBuilder {
3130
PlanStreamWrapperQueryBuilder::new
3231
);
3332

33+
private static final TransportVersion ESQL_FIXED_INDEX_LIKE = TransportVersion.fromName("esql_fixed_index_like");
34+
3435
private final Configuration configuration;
3536
private final QueryBuilder next;
3637

@@ -53,7 +54,7 @@ public void writeTo(StreamOutput out) throws IOException {
5354

5455
@Override
5556
public TransportVersion getMinimalSupportedVersion() {
56-
return TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19;
57+
return ESQL_FIXED_INDEX_LIKE;
5758
}
5859

5960
@Override

0 commit comments

Comments
 (0)