Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ static TransportVersion def(int id) {
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62);
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_8_19 = def(8_841_0_63);
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_8_19 = def(8_841_0_64);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_4 = def(8_841_0_68);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
Expand Down Expand Up @@ -325,7 +324,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_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_4 = def(9_112_0_07);

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.apache.lucene.search.MultiTermQuery;
import org.apache.lucene.search.Query;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
Expand All @@ -41,6 +40,7 @@
*/
public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuilder> implements MultiTermQueryBuilder {
public static final String NAME = "wildcard";
private static final TransportVersion ESQL_FIXED_INDEX_LIKE = TransportVersion.fromName("esql_fixed_index_like");

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

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9119000,9112002,8841064
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import org.apache.lucene.search.Query;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand All @@ -33,6 +32,8 @@ public class PlanStreamWrapperQueryBuilder implements QueryBuilder {
PlanStreamWrapperQueryBuilder::new
);

private static final TransportVersion ESQL_FIXED_INDEX_LIKE = TransportVersion.fromName("esql_fixed_index_like");

private final Configuration configuration;
private final QueryBuilder next;

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

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1;
return ESQL_FIXED_INDEX_LIKE;
}

@Override
Expand Down