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
22 changes: 0 additions & 22 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
Original file line number Diff line number Diff line change
Expand Up @@ -193,17 +193,6 @@ static TransportVersion def(int id) {
public static final TransportVersion NONE_CHUNKING_STRATEGY_8_19 = def(8_841_0_49);
public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ALLOW_LIST_8_19 = def(8_841_0_50);
public static final TransportVersion SETTINGS_IN_DATA_STREAMS_8_19 = def(8_841_0_51);
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_REMOVE_ERROR_PARSING_8_19 = def(8_841_0_52);
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_BATCH_SIZE_8_19 = def(8_841_0_53);
public static final TransportVersion STREAMS_LOGS_SUPPORT_8_19 = def(8_841_0_54);
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE_8_19 = def(8_841_0_55);
public static final TransportVersion RANDOM_SAMPLER_QUERY_BUILDER_8_19 = def(8_841_0_56);
public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC_8_19 = def(8_841_0_57);
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19 = def(8_841_0_58);
public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19 = def(8_841_0_59);
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION_8_19 = def(8_841_0_60);
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 INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);
Expand Down Expand Up @@ -268,14 +257,12 @@ static TransportVersion def(int id) {
public static final TransportVersion DEAD_BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_053_0_00);
public static final TransportVersion DEAD_SEARCH_INCREMENTAL_TOP_DOCS_NULL = def(9_054_0_00);
public static final TransportVersion ESQL_QUERY_PLANNING_DURATION = def(9_055_0_00);
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_056_0_00);
public static final TransportVersion BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_057_0_00);
public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL = def(9_058_0_00);
public static final TransportVersion COMPRESS_DELAYABLE_WRITEABLE = def(9_059_0_00);
public static final TransportVersion SYNONYMS_REFRESH_PARAM = def(9_060_0_00);
public static final TransportVersion DOC_FIELDS_AS_LIST = def(9_061_0_00);
public static final TransportVersion DENSE_VECTOR_OFF_HEAP_STATS = def(9_062_00_0);
public static final TransportVersion RANDOM_SAMPLER_QUERY_BUILDER = def(9_063_0_00);
public static final TransportVersion SETTINGS_IN_DATA_STREAMS = def(9_064_0_00);
public static final TransportVersion INTRODUCE_FAILURES_LIFECYCLE = def(9_065_0_00);
public static final TransportVersion PROJECT_METADATA_SETTINGS = def(9_066_0_00);
Expand Down Expand Up @@ -314,16 +301,7 @@ static TransportVersion def(int id) {
public static final TransportVersion SECURITY_CLOUD_API_KEY_REALM_AND_TYPE = def(9_099_0_00);
public static final TransportVersion STATE_PARAM_GET_SNAPSHOT = def(9_100_0_00);
public static final TransportVersion PROJECT_ID_IN_SNAPSHOTS_DELETIONS_AND_REPO_CLEANUP = def(9_101_0_00);
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_REMOVE_ERROR_PARSING = def(9_102_0_00);
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_BATCH_SIZE = def(9_103_0_00);
public static final TransportVersion STREAMS_LOGS_SUPPORT = def(9_104_0_00);
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE = def(9_105_0_00);
public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC = def(9_106_0_00);
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = def(9_107_0_00);
public static final TransportVersion CLUSTER_STATE_PROJECTS_SETTINGS = def(9_108_0_00);
public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED = def(9_109_00_0);
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
public static final TransportVersion INDEX_SOURCE = def(9_158_0_00);
public static final TransportVersion MAX_HEAP_SIZE_PER_NODE_IN_CLUSTER_INFO = def(9_159_0_00);
public static final TransportVersion TIMESERIES_DEFAULT_LIMIT = def(9_160_0_00);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.cluster.metadata;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.cluster.AbstractNamedDiffable;
import org.elasticsearch.cluster.NamedDiff;
import org.elasticsearch.common.collect.Iterators;
Expand Down Expand Up @@ -43,6 +42,7 @@ public class StreamsMetadata extends AbstractNamedDiffable<Metadata.ProjectCusto
static {
PARSER.declareBoolean(ConstructingObjectParser.constructorArg(), LOGS_ENABLED);
}
private static final TransportVersion STREAMS_LOGS_SUPPORT = TransportVersion.fromName("streams_logs_support");

public boolean logsEnabled;

Expand Down Expand Up @@ -70,13 +70,12 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.STREAMS_LOGS_SUPPORT_8_19;
return STREAMS_LOGS_SUPPORT;
}

@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.STREAMS_LOGS_SUPPORT)
|| version.isPatchFrom(TransportVersions.STREAMS_LOGS_SUPPORT_8_19);
return version.supports(STREAMS_LOGS_SUPPORT);
}

public static NamedDiff<Metadata.ProjectCustom> readDiffFrom(StreamInput in) throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import org.apache.lucene.search.Query;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.Randomness;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand All @@ -36,6 +35,8 @@ public class RandomSamplingQueryBuilder extends AbstractQueryBuilder<RandomSampl
static final ParseField SEED = new ParseField("seed");
static final ParseField HASH = new ParseField("hash");

private static final TransportVersion RANDOM_SAMPLER_QUERY_BUILDER = TransportVersion.fromName("random_sampler_query_builder");

private final double probability;
private int seed = Randomness.get().nextInt();
private int hash = 0;
Expand Down Expand Up @@ -141,8 +142,7 @@ public String getWriteableName() {

@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.RANDOM_SAMPLER_QUERY_BUILDER)
|| version.isPatchFrom(TransportVersions.RANDOM_SAMPLER_QUERY_BUILDER_8_19);
return version.supports(RANDOM_SAMPLER_QUERY_BUILDER);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9056000,8841061
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9111000,8841062
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9110000,8841060
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9103000,8841053
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9105000,8841055
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9102000,8841052
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9109000,8841059
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9106000,8841057
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9063000,8841056
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9107000,8841058
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9104000,8841054
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ public class SparseVectorQueryBuilder extends AbstractQueryBuilder<SparseVectorQ

private static final boolean DEFAULT_PRUNE = false;

static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19 = TransportVersions.SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19;
static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = TransportVersions.SPARSE_VECTOR_FIELD_PRUNING_OPTIONS;
private static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = TransportVersion.fromName(
"sparse_vector_field_pruning_options"
);

private final String fieldName;
private final List<WeightedToken> queryVectors;
Expand Down Expand Up @@ -128,8 +129,7 @@ public SparseVectorQueryBuilder(StreamInput in) throws IOException {
super(in);
this.fieldName = in.readString();

if (in.getTransportVersion().isPatchFrom(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19)
|| in.getTransportVersion().onOrAfter(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS)) {
if (in.getTransportVersion().supports(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS)) {
this.shouldPruneTokens = in.readOptionalBoolean();
} else {
this.shouldPruneTokens = in.readBoolean();
Expand Down Expand Up @@ -184,8 +184,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {

out.writeString(fieldName);

if (out.getTransportVersion().isPatchFrom(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19)
|| out.getTransportVersion().onOrAfter(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS)) {
if (out.getTransportVersion().supports(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS)) {
out.writeOptionalBoolean(shouldPruneTokens);
} else {
out.writeBoolean(shouldPruneTokens);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
import java.util.Map;
import java.util.Objects;

import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;

public class ValuesSourceReaderOperatorStatus extends AbstractPageMappingToIteratorOperator.Status {
public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
Operator.Status.class,
"values_source_reader",
ValuesSourceReaderOperatorStatus::readFrom
);

private static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = TransportVersion.fromName(
"esql_documents_found_and_values_loaded"
);
private static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES = TransportVersion.fromName("esql_split_on_big_values");

private final Map<String, Integer> readersBuilt;
Expand Down Expand Up @@ -106,8 +106,7 @@ private static boolean supportsSplitOnBigValues(TransportVersion version) {
}

private static boolean supportsValuesLoaded(TransportVersion version) {
return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
|| version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
return version.supports(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

package org.elasticsearch.compute.operator;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
Expand Down Expand Up @@ -89,15 +89,16 @@ public static DriverCompletionInfo excludingProfiles(List<Driver> drivers) {
return new DriverCompletionInfo(documentsFound, valuesLoaded, List.of(), List.of());
}

private static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = TransportVersion.fromName("esql_profile_include_plan");

public static DriverCompletionInfo readFrom(StreamInput in) throws IOException {
return new DriverCompletionInfo(
in.readVLong(),
in.readVLong(),
in.readCollectionAsImmutableList(DriverProfile::readFrom),
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_PROFILE_INCLUDE_PLAN)
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_PROFILE_INCLUDE_PLAN_8_19)
? in.readCollectionAsImmutableList(PlanProfile::readFrom)
: List.of()
in.getTransportVersion().supports(ESQL_PROFILE_INCLUDE_PLAN)
? in.readCollectionAsImmutableList(PlanProfile::readFrom)
: List.of()
);
}

Expand All @@ -106,8 +107,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeVLong(documentsFound);
out.writeVLong(valuesLoaded);
out.writeCollection(driverProfiles);
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_PROFILE_INCLUDE_PLAN)
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_PROFILE_INCLUDE_PLAN_8_19)) {
if (out.getTransportVersion().supports(ESQL_PROFILE_INCLUDE_PLAN)) {
out.writeCollection(planProfiles);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.elasticsearch.xpack.esql.action;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.Iterators;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down Expand Up @@ -37,9 +36,6 @@
import java.util.Objects;
import java.util.Optional;

import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;

public class EsqlQueryResponse extends org.elasticsearch.xpack.core.esql.action.EsqlQueryResponse
implements
ChunkedToXContentObject,
Expand All @@ -48,6 +44,11 @@ public class EsqlQueryResponse extends org.elasticsearch.xpack.core.esql.action.
@SuppressWarnings("this-escape")
private final AbstractRefCounted counted = AbstractRefCounted.of(this::closeInternal);

private static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = TransportVersion.fromName(
"esql_documents_found_and_values_loaded"
);
private static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = TransportVersion.fromName("esql_profile_include_plan");

public static final String DROP_NULL_COLUMNS_OPTION = "drop_null_columns";

private final List<ColumnInfoImpl> columns;
Expand Down Expand Up @@ -152,8 +153,7 @@ public void writeTo(StreamOutput out) throws IOException {
}

private static boolean supportsValuesLoaded(TransportVersion version) {
return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
|| version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
return version.supports(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED);
}

public List<ColumnInfoImpl> columns() {
Expand Down Expand Up @@ -388,18 +388,16 @@ public record Profile(List<DriverProfile> drivers, List<PlanProfile> plans) impl
public static Profile readFrom(StreamInput in) throws IOException {
return new Profile(
in.readCollectionAsImmutableList(DriverProfile::readFrom),
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_PROFILE_INCLUDE_PLAN)
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_PROFILE_INCLUDE_PLAN_8_19)
? in.readCollectionAsImmutableList(PlanProfile::readFrom)
: List.of()
in.getTransportVersion().supports(ESQL_PROFILE_INCLUDE_PLAN)
? in.readCollectionAsImmutableList(PlanProfile::readFrom)
: List.of()
);
}

@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeCollection(drivers);
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_PROFILE_INCLUDE_PLAN)
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_PROFILE_INCLUDE_PLAN_8_19)) {
if (out.getTransportVersion().supports(ESQL_PROFILE_INCLUDE_PLAN)) {
out.writeCollection(plans);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
import java.io.IOException;
import java.util.List;

import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;

/**
* The compute result of {@link DataNodeRequest} or {@link ClusterComputeRequest}
*/
final class ComputeResponse extends TransportResponse {

private static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = TransportVersion.fromName(
"esql_documents_found_and_values_loaded"
);

private final DriverCompletionInfo completionInfo;

// for use with ClusterComputeRequests (cross-cluster searches)
Expand Down Expand Up @@ -102,8 +104,7 @@ public void writeTo(StreamOutput out) throws IOException {
}

private static boolean supportsCompletionInfo(TransportVersion version) {
return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
|| version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
return version.supports(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED);
}

public DriverCompletionInfo getCompletionInfo() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
import java.util.List;
import java.util.Map;

import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;

/**
* The compute result of {@link DataNodeRequest}
*/
final class DataNodeComputeResponse extends TransportResponse {

private static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = TransportVersion.fromName(
"esql_documents_found_and_values_loaded"
);

private final DriverCompletionInfo completionInfo;
private final Map<ShardId, Exception> shardLevelFailures;

Expand Down Expand Up @@ -68,8 +70,7 @@ public void writeTo(StreamOutput out) throws IOException {
}

private static boolean supportsCompletionInfo(TransportVersion version) {
return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
|| version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
return version.supports(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED);
}

public DriverCompletionInfo completionInfo() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ public class CohereServiceSettings extends FilteredXContentObject implements Ser
public static final String API_VERSION = "api_version";
public static final String MODEL_REQUIRED_FOR_V2_API = "The [service_settings.model_id] field is required for the Cohere V2 API.";

private static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = TransportVersion.fromName("ml_inference_cohere_api_version");

public enum CohereApiVersion {
V1,
V2;
Expand Down Expand Up @@ -182,8 +184,7 @@ public CohereServiceSettings(StreamInput in) throws IOException {
} else {
rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS;
}
if (in.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
|| in.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19)) {
if (in.getTransportVersion().supports(ML_INFERENCE_COHERE_API_VERSION)) {
this.apiVersion = in.readEnum(CohereServiceSettings.CohereApiVersion.class);
} else {
this.apiVersion = CohereServiceSettings.CohereApiVersion.V1;
Expand Down Expand Up @@ -285,8 +286,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
rateLimitSettings.writeTo(out);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
|| out.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19)) {
if (out.getTransportVersion().supports(ML_INFERENCE_COHERE_API_VERSION)) {
out.writeEnum(apiVersion);
}
}
Expand Down
Loading