Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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: 2 additions & 0 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ 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 V_9_0_0 = def(9_000_0_09);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
Expand Down Expand Up @@ -328,6 +329,7 @@ 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);
// Below is the first version in 9.2 and NOT in 9.1.
public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00);
public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
import java.io.IOException;
import java.util.Objects;

import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19;
import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1;

/**
* Implements the wildcard search query. Supported wildcards are {@code *}, which
* matches any character sequence (including the empty one), and {@code ?},
Expand Down Expand Up @@ -104,7 +107,9 @@ public WildcardQueryBuilder(StreamInput in) throws IOException {
value = in.readString();
rewrite = in.readOptionalString();
caseInsensitive = in.readBoolean();
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
|| in.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
|| in.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1)) {
forceStringMatch = in.readBoolean();
} else {
forceStringMatch = false;
Expand All @@ -117,7 +122,9 @@ protected void doWriteTo(StreamOutput out) throws IOException {
out.writeString(value);
out.writeOptionalString(rewrite);
out.writeBoolean(caseInsensitive);
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
|| out.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
|| out.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1)) {
out.writeBoolean(forceStringMatch);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
import java.util.function.Supplier;
import java.util.stream.Collectors;

import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19;
import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1;

public class WildcardLikeList extends RegexMatch<WildcardPatternList> {
public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
Expression.class,
Expand Down Expand Up @@ -145,7 +148,10 @@ public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHand
}

private boolean supportsPushdown(TransportVersion version) {
return version == null || version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE);
return version == null
|| version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
|| version.isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
|| version.isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ESQL_FIXED_INDEX_LIKE;
}

@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
|| version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19)
|| version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1);
}

@Override
public Query toQuery(SearchExecutionContext context) throws IOException {
return next.toQuery(context);
Expand Down