Skip to content

Commit 1498f88

Browse files
authored
[8.x] Rewire 8.19 backport constants to avoid conflicts with 8.18 backport constants (elastic#122580)
1 parent 0668078 commit 1498f88

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,11 @@ static TransportVersion def(int id) {
180180
public static final TransportVersion TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER = def(8_838_0_00);
181181
public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
182182
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
183-
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_840_0_01);
184-
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_X = def(8_840_0_02);
185-
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE_BACKPORT_8_19 = def(8_840_0_03);
186-
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS_BACKPORT_8_19 = def(8_840_0_04);
183+
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
184+
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_841_0_01);
185+
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_X = def(8_841_0_02);
186+
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE_BACKPORT_8_19 = def(8_841_0_03);
187+
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS_BACKPORT_8_19 = def(8_841_0_04);
187188

188189
/*
189190
* STOP! READ THIS FIRST! No, really,

server/src/test/java/org/elasticsearch/TransportVersionTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
public class TransportVersionTests extends ESTestCase {
3232

3333
/**
34-
* This test is specific for 8.19, to ensure that transport versions are backported correctly. Do not forward or backport it.
34+
* This test is specific for 8.19, to ensure that transport versions are backported correctly. Do not forward or backport it,
35+
* and do not adjust the TransportVersion to check (INITIAL_ELASTICSEARCH_8_19).
36+
* If the test fails, there is something wrong with your backport PR.
3537
*/
3638
public void testMaximumAllowedTransportVersion() {
37-
assertThat(TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ML_INFERENCE_IBM_WATSONX_RERANK_ADDED), is(true));
39+
assertThat(TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.INITIAL_ELASTICSEARCH_8_19), is(true));
3840
}
3941

4042
public void testVersionComparison() {

0 commit comments

Comments
 (0)