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
7 changes: 3 additions & 4 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ static TransportVersion def(int id) {
public static final TransportVersion ESQL_SKIP_ES_INDEX_SERIALIZATION = def(8_827_0_00);
public static final TransportVersion ADD_INDEX_BLOCK_TWO_PHASE = def(8_828_0_00);
public static final TransportVersion RESOLVE_CLUSTER_NO_INDEX_EXPRESSION = def(8_829_0_00);
public static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = def(8_830_0_00);
public static final TransportVersion ADD_INCLUDE_FAILURE_INDICES_OPTION = def(8_831_0_00);
public static final TransportVersion ESQL_RESPONSE_PARTIAL = def(8_832_0_00);
public static final TransportVersion RANK_DOC_OPTIONAL_METADATA_FOR_EXPLAIN = def(8_833_0_00);
Expand All @@ -146,7 +147,6 @@ static TransportVersion def(int id) {
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_2 = def(8_840_0_04);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_3 = def(8_840_0_05);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_4 = def(8_840_0_06);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_6 = def(8_840_0_08);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_7 = def(8_840_0_09);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_841_0_01);
Expand Down Expand Up @@ -210,17 +210,16 @@ static TransportVersion def(int id) {
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 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_1 = def(8_841_0_65);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_2 = def(8_841_0_66);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_3 = def(8_841_0_67);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_4 = def(8_841_0_68);
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);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_3 = def(9_000_0_12);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_4 = def(9_000_0_13);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_6 = def(9_000_0_15);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_7 = def(9_000_0_16);
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES = def(9_002_0_00);
Expand Down Expand Up @@ -333,11 +332,11 @@ static TransportVersion def(int id) {
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 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 ESQL_SAMPLE_OPERATOR_STATUS_9_1 = def(9_112_0_03);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_1 = def(9_112_0_04);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_2 = def(9_112_0_05);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_3 = def(9_112_0_06);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_4 = def(9_112_0_07);

/*
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8840008
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8841067
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9000015
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9112006
2 changes: 1 addition & 1 deletion server/src/main/resources/transport/upper_bounds/8.18.csv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
initial_elasticsearch_8_18_5,8840007
initial_elasticsearch_8_18_6,8840008
2 changes: 1 addition & 1 deletion server/src/main/resources/transport/upper_bounds/8.19.csv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
esql_split_on_big_values,8841063
initial_elasticsearch_8_19_3,8841067
2 changes: 1 addition & 1 deletion server/src/main/resources/transport/upper_bounds/9.0.csv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
initial_elasticsearch_9_0_5,9000014
initial_elasticsearch_9_0_6,9000015
2 changes: 1 addition & 1 deletion server/src/main/resources/transport/upper_bounds/9.1.csv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
esql_split_on_big_values,9112001
initial_elasticsearch_9_1_3,9112006
1 change: 0 additions & 1 deletion server/src/main/resources/transport/upper_bounds/9.2.csv

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@

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

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 SPLIT_ON_BIG_VALUES = TransportVersion.fromName("esql_split_on_big_values");

private final Map<String, Integer> readersBuilt;
private final long valuesLoaded;
Expand Down Expand Up @@ -101,7 +102,7 @@ public void writeTo(StreamOutput out) throws IOException {
}

private static boolean supportsSplitOnBigValues(TransportVersion version) {
return version.supports(SPLIT_ON_BIG_VALUES);
return version.onOrAfter(ESQL_SPLIT_ON_BIG_VALUES_9_1) || version.isPatchFrom(ESQL_SPLIT_ON_BIG_VALUES_8_19);
}

private static boolean supportsValuesLoaded(TransportVersion version) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.util.Arrays;
import java.util.List;

import static org.elasticsearch.TransportVersions.ML_ROLLOVER_LEGACY_INDICES;
import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;
import static org.elasticsearch.xpack.core.ml.utils.MlIndexAndAlias.FIRST_INDEX_SIX_DIGIT_SUFFIX;
import static org.elasticsearch.xpack.core.ml.utils.MlIndexAndAlias.has6DigitSuffix;
Expand All @@ -52,8 +53,6 @@ public class MlAnomaliesIndexUpdate implements MlAutoUpdateService.UpdateAction

private static final Logger logger = LogManager.getLogger(MlAnomaliesIndexUpdate.class);

private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices");

private final IndexNameExpressionResolver expressionResolver;
private final OriginSettingClient client;

Expand All @@ -66,7 +65,7 @@ public MlAnomaliesIndexUpdate(IndexNameExpressionResolver expressionResolver, Cl
public boolean isMinTransportVersionSupported(TransportVersion minTransportVersion) {
// Automatic rollover does not require any new features
// but wait for all nodes to be upgraded anyway
return minTransportVersion.supports(ML_ROLLOVER_LEGACY_INDICES);
return minTransportVersion.onOrAfter(ML_ROLLOVER_LEGACY_INDICES);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;

import static org.elasticsearch.TransportVersions.ML_ROLLOVER_LEGACY_INDICES;
import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;

/**
Expand All @@ -43,8 +44,6 @@ public class MlIndexRollover implements MlAutoUpdateService.UpdateAction {

private static final Logger logger = LogManager.getLogger(MlIndexRollover.class);

private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices");

public record IndexPatternAndAlias(String indexPattern, String alias) {}

private final IndexNameExpressionResolver expressionResolver;
Expand Down