|
| 1 | +diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java |
| 2 | +index 2d6c47eefff..85f7d758690 100644 |
| 3 | +--- a/server/src/main/java/org/elasticsearch/TransportVersions.java |
| 4 | ++++ b/server/src/main/java/org/elasticsearch/TransportVersions.java |
| 5 | +@@ -130,6 +130,7 @@ public class TransportVersions { |
| 6 | + public static final TransportVersion ESQL_SKIP_ES_INDEX_SERIALIZATION = def(8_827_0_00); |
| 7 | + public static final TransportVersion ADD_INDEX_BLOCK_TWO_PHASE = def(8_828_0_00); |
| 8 | + public static final TransportVersion RESOLVE_CLUSTER_NO_INDEX_EXPRESSION = def(8_829_0_00); |
| 9 | ++ public static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = def(8_830_0_00); |
| 10 | + public static final TransportVersion ADD_INCLUDE_FAILURE_INDICES_OPTION = def(8_831_0_00); |
| 11 | + public static final TransportVersion ESQL_RESPONSE_PARTIAL = def(8_832_0_00); |
| 12 | + public static final TransportVersion RANK_DOC_OPTIONAL_METADATA_FOR_EXPLAIN = def(8_833_0_00); |
| 13 | +@@ -146,7 +147,6 @@ public class TransportVersions { |
| 14 | + public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_2 = def(8_840_0_04); |
| 15 | + public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_3 = def(8_840_0_05); |
| 16 | + public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_4 = def(8_840_0_06); |
| 17 | +- public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_6 = def(8_840_0_08); |
| 18 | + public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_7 = def(8_840_0_09); |
| 19 | + public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00); |
| 20 | + public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_841_0_01); |
| 21 | +@@ -210,17 +210,16 @@ public class TransportVersions { |
| 22 | + public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION_8_19 = def(8_841_0_60); |
| 23 | + public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61); |
| 24 | + public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62); |
| 25 | ++ public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_8_19 = def(8_841_0_63); |
| 26 | + public static final TransportVersion ESQL_FIXED_INDEX_LIKE_8_19 = def(8_841_0_64); |
| 27 | + public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_1 = def(8_841_0_65); |
| 28 | + public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_2 = def(8_841_0_66); |
| 29 | +- public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_3 = def(8_841_0_67); |
| 30 | + public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_4 = def(8_841_0_68); |
| 31 | + public static final TransportVersion V_9_0_0 = def(9_000_0_09); |
| 32 | + public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10); |
| 33 | + public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11); |
| 34 | + public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_3 = def(9_000_0_12); |
| 35 | + public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_4 = def(9_000_0_13); |
| 36 | +- public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_6 = def(9_000_0_15); |
| 37 | + public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_7 = def(9_000_0_16); |
| 38 | + public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00); |
| 39 | + public static final TransportVersion REMOVE_SNAPSHOT_FAILURES = def(9_002_0_00); |
| 40 | +@@ -333,15 +332,16 @@ public class TransportVersions { |
| 41 | + public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00); |
| 42 | + public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00); |
| 43 | + public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00); |
| 44 | ++ public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01); |
| 45 | + public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02); |
| 46 | + public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS_9_1 = def(9_112_0_03); |
| 47 | + public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_1 = def(9_112_0_04); |
| 48 | + public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_2 = def(9_112_0_05); |
| 49 | +- public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_3 = def(9_112_0_06); |
| 50 | + public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_4 = def(9_112_0_07); |
| 51 | + public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00); |
| 52 | + public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00); |
| 53 | + public static final TransportVersion ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED = def(9_115_0_00); |
| 54 | ++ public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES = def(9_116_0_00); |
| 55 | + public static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = def(9_117_0_00); |
| 56 | + public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE = def(9_118_0_00); |
| 57 | + public static final TransportVersion ESQL_FIXED_INDEX_LIKE = def(9_119_0_00); |
| 58 | +diff --git a/server/src/main/resources/transport/definitions/referable/esql_split_on_big_values.csv b/server/src/main/resources/transport/definitions/referable/esql_split_on_big_values.csv |
| 59 | +deleted file mode 100644 |
| 60 | +index 3d0c94f8fa4..00000000000 |
| 61 | +--- a/server/src/main/resources/transport/definitions/referable/esql_split_on_big_values.csv |
| 62 | ++++ /dev/null |
| 63 | +@@ -1 +0,0 @@ |
| 64 | +-9116000,9112001,8841063 |
| 65 | +diff --git a/server/src/main/resources/transport/definitions/referable/ml_rollover_legacy_indices.csv b/server/src/main/resources/transport/definitions/referable/ml_rollover_legacy_indices.csv |
| 66 | +deleted file mode 100644 |
| 67 | +index 2b049c72d49..00000000000 |
| 68 | +--- a/server/src/main/resources/transport/definitions/referable/ml_rollover_legacy_indices.csv |
| 69 | ++++ /dev/null |
| 70 | +@@ -1 +0,0 @@ |
| 71 | +-8830000 |
| 72 | +diff --git a/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_18_6.csv b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_18_6.csv |
| 73 | +new file mode 100644 |
| 74 | +index 00000000000..0ff8fc01e91 |
| 75 | +--- /dev/null |
| 76 | ++++ b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_18_6.csv |
| 77 | +@@ -0,0 +1 @@ |
| 78 | ++8840008 |
| 79 | +diff --git a/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_19_3.csv b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_19_3.csv |
| 80 | +new file mode 100644 |
| 81 | +index 00000000000..20882a00fd8 |
| 82 | +--- /dev/null |
| 83 | ++++ b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_8_19_3.csv |
| 84 | +@@ -0,0 +1 @@ |
| 85 | ++8841067 |
| 86 | +diff --git a/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_0_6.csv b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_0_6.csv |
| 87 | +new file mode 100644 |
| 88 | +index 00000000000..9cbaf3dd8c2 |
| 89 | +--- /dev/null |
| 90 | ++++ b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_0_6.csv |
| 91 | +@@ -0,0 +1 @@ |
| 92 | ++9000015 |
| 93 | +diff --git a/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_1_3.csv b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_1_3.csv |
| 94 | +new file mode 100644 |
| 95 | +index 00000000000..9cba3c528df |
| 96 | +--- /dev/null |
| 97 | ++++ b/server/src/main/resources/transport/definitions/unreferable/initial_elasticsearch_9_1_3.csv |
| 98 | +@@ -0,0 +1 @@ |
| 99 | ++9112006 |
| 100 | +diff --git a/server/src/main/resources/transport/upper_bounds/8.18.csv b/server/src/main/resources/transport/upper_bounds/8.18.csv |
| 101 | +index 2f86b671455..4eb5140004e 100644 |
| 102 | +--- a/server/src/main/resources/transport/upper_bounds/8.18.csv |
| 103 | ++++ b/server/src/main/resources/transport/upper_bounds/8.18.csv |
| 104 | +@@ -1 +1 @@ |
| 105 | +-initial_elasticsearch_8_18_5,8840007 |
| 106 | ++initial_elasticsearch_8_18_6,8840008 |
| 107 | +diff --git a/server/src/main/resources/transport/upper_bounds/8.19.csv b/server/src/main/resources/transport/upper_bounds/8.19.csv |
| 108 | +index 7f608c0ced6..476468b2038 100644 |
| 109 | +--- a/server/src/main/resources/transport/upper_bounds/8.19.csv |
| 110 | ++++ b/server/src/main/resources/transport/upper_bounds/8.19.csv |
| 111 | +@@ -1 +1 @@ |
| 112 | +-esql_split_on_big_values,8841063 |
| 113 | ++initial_elasticsearch_8_19_3,8841067 |
| 114 | +diff --git a/server/src/main/resources/transport/upper_bounds/9.0.csv b/server/src/main/resources/transport/upper_bounds/9.0.csv |
| 115 | +index e0a322af52b..f8f50cc6d78 100644 |
| 116 | +--- a/server/src/main/resources/transport/upper_bounds/9.0.csv |
| 117 | ++++ b/server/src/main/resources/transport/upper_bounds/9.0.csv |
| 118 | +@@ -1 +1 @@ |
| 119 | +-initial_elasticsearch_9_0_5,9000014 |
| 120 | ++initial_elasticsearch_9_0_6,9000015 |
| 121 | +diff --git a/server/src/main/resources/transport/upper_bounds/9.1.csv b/server/src/main/resources/transport/upper_bounds/9.1.csv |
| 122 | +index 19c74372653..079475f1a2f 100644 |
| 123 | +--- a/server/src/main/resources/transport/upper_bounds/9.1.csv |
| 124 | ++++ b/server/src/main/resources/transport/upper_bounds/9.1.csv |
| 125 | +@@ -1 +1 @@ |
| 126 | +-esql_split_on_big_values,9112001 |
| 127 | ++initial_elasticsearch_9_1_3,9112006 |
| 128 | +diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorStatus.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorStatus.java |
| 129 | +index 13ed5e4c84b..4a8fcda81f8 100644 |
| 130 | +--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorStatus.java |
| 131 | ++++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorStatus.java |
| 132 | +@@ -23,6 +23,9 @@ import java.util.Objects; |
| 133 | + |
| 134 | + import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED; |
| 135 | + import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19; |
| 136 | ++import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES; |
| 137 | ++import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES_8_19; |
| 138 | ++import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES_9_1; |
| 139 | + |
| 140 | + public class ValuesSourceReaderOperatorStatus extends AbstractPageMappingToIteratorOperator.Status { |
| 141 | + public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry( |
| 142 | +@@ -30,7 +33,6 @@ public class ValuesSourceReaderOperatorStatus extends AbstractPageMappingToItera |
| 143 | + "values_source_reader", |
| 144 | + ValuesSourceReaderOperatorStatus::readFrom |
| 145 | + ); |
| 146 | +- private static final TransportVersion SPLIT_ON_BIG_VALUES = TransportVersion.fromName("esql_split_on_big_values"); |
| 147 | + |
| 148 | + private final Map<String, Integer> readersBuilt; |
| 149 | + private final long valuesLoaded; |
| 150 | +@@ -101,7 +103,9 @@ public class ValuesSourceReaderOperatorStatus extends AbstractPageMappingToItera |
| 151 | + } |
| 152 | + |
| 153 | + private static boolean supportsSplitOnBigValues(TransportVersion version) { |
| 154 | +- return version.supports(SPLIT_ON_BIG_VALUES); |
| 155 | ++ return version.onOrAfter(ESQL_SPLIT_ON_BIG_VALUES) |
| 156 | ++ || version.isPatchFrom(ESQL_SPLIT_ON_BIG_VALUES_9_1) |
| 157 | ++ || version.isPatchFrom(ESQL_SPLIT_ON_BIG_VALUES_8_19); |
| 158 | + } |
| 159 | + |
| 160 | + private static boolean supportsValuesLoaded(TransportVersion version) { |
| 161 | +diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java |
| 162 | +index fb20a22a258..8067fcfde4a 100644 |
| 163 | +--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java |
| 164 | ++++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdate.java |
| 165 | +@@ -40,6 +40,7 @@ import java.util.ArrayList; |
| 166 | + import java.util.Arrays; |
| 167 | + import java.util.List; |
| 168 | + |
| 169 | ++import static org.elasticsearch.TransportVersions.ML_ROLLOVER_LEGACY_INDICES; |
| 170 | + import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN; |
| 171 | + import static org.elasticsearch.xpack.core.ml.utils.MlIndexAndAlias.FIRST_INDEX_SIX_DIGIT_SUFFIX; |
| 172 | + import static org.elasticsearch.xpack.core.ml.utils.MlIndexAndAlias.has6DigitSuffix; |
| 173 | +@@ -52,8 +53,6 @@ public class MlAnomaliesIndexUpdate implements MlAutoUpdateService.UpdateAction |
| 174 | + |
| 175 | + private static final Logger logger = LogManager.getLogger(MlAnomaliesIndexUpdate.class); |
| 176 | + |
| 177 | +- private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices"); |
| 178 | +- |
| 179 | + private final IndexNameExpressionResolver expressionResolver; |
| 180 | + private final OriginSettingClient client; |
| 181 | + |
| 182 | +@@ -66,7 +65,7 @@ public class MlAnomaliesIndexUpdate implements MlAutoUpdateService.UpdateAction |
| 183 | + public boolean isMinTransportVersionSupported(TransportVersion minTransportVersion) { |
| 184 | + // Automatic rollover does not require any new features |
| 185 | + // but wait for all nodes to be upgraded anyway |
| 186 | +- return minTransportVersion.supports(ML_ROLLOVER_LEGACY_INDICES); |
| 187 | ++ return minTransportVersion.onOrAfter(ML_ROLLOVER_LEGACY_INDICES); |
| 188 | + } |
| 189 | + |
| 190 | + @Override |
| 191 | +diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java |
| 192 | +index ba47fa5558c..e5613a61552 100644 |
| 193 | +--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java |
| 194 | ++++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlIndexRollover.java |
| 195 | +@@ -30,6 +30,7 @@ import org.elasticsearch.xpack.core.ml.utils.MlIndexAndAlias; |
| 196 | + import java.util.ArrayList; |
| 197 | + import java.util.List; |
| 198 | + |
| 199 | ++import static org.elasticsearch.TransportVersions.ML_ROLLOVER_LEGACY_INDICES; |
| 200 | + import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN; |
| 201 | + |
| 202 | + /** |
| 203 | +@@ -43,8 +44,6 @@ public class MlIndexRollover implements MlAutoUpdateService.UpdateAction { |
| 204 | + |
| 205 | + private static final Logger logger = LogManager.getLogger(MlIndexRollover.class); |
| 206 | + |
| 207 | +- private static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = TransportVersion.fromName("ml_rollover_legacy_indices"); |
| 208 | +- |
| 209 | + public record IndexPatternAndAlias(String indexPattern, String alias) {} |
| 210 | + |
| 211 | + private final IndexNameExpressionResolver expressionResolver; |
0 commit comments