Skip to content

Commit 780af6f

Browse files
authored
Migrate transport versions 9116_000, 9112_001, 8841_063 (#134508)
ES-12334
1 parent 64c7ad9 commit 780af6f

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ static TransportVersion def(int id) {
199199
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION_8_19 = def(8_841_0_60);
200200
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
201201
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62);
202-
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_8_19 = def(8_841_0_63);
203202
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_4 = def(8_841_0_68);
204203
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
205204
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
@@ -323,11 +322,9 @@ static TransportVersion def(int id) {
323322
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
324323
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
325324
public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00);
326-
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
327325
public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00);
328326
public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00);
329327
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED = def(9_115_0_00);
330-
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES = def(9_116_0_00);
331328
public static final TransportVersion INFERENCE_API_EIS_DIAGNOSTICS = def(9_156_0_00);
332329
public static final TransportVersion ML_INFERENCE_ENDPOINT_CACHE = def(9_157_0_00);
333330

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9116000,9112001,8841063

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorStatus.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323

2424
import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
2525
import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;
26-
import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES;
27-
import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES_8_19;
28-
import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES_9_1;
2926

3027
public class ValuesSourceReaderOperatorStatus extends AbstractPageMappingToIteratorOperator.Status {
3128
public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
@@ -34,6 +31,8 @@ public class ValuesSourceReaderOperatorStatus extends AbstractPageMappingToItera
3431
ValuesSourceReaderOperatorStatus::readFrom
3532
);
3633

34+
private static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES = TransportVersion.fromName("esql_split_on_big_values");
35+
3736
private final Map<String, Integer> readersBuilt;
3837
private final long valuesLoaded;
3938

@@ -103,9 +102,7 @@ public void writeTo(StreamOutput out) throws IOException {
103102
}
104103

105104
private static boolean supportsSplitOnBigValues(TransportVersion version) {
106-
return version.onOrAfter(ESQL_SPLIT_ON_BIG_VALUES)
107-
|| version.isPatchFrom(ESQL_SPLIT_ON_BIG_VALUES_9_1)
108-
|| version.isPatchFrom(ESQL_SPLIT_ON_BIG_VALUES_8_19);
105+
return version.supports(ESQL_SPLIT_ON_BIG_VALUES);
109106
}
110107

111108
private static boolean supportsValuesLoaded(TransportVersion version) {

0 commit comments

Comments
 (0)