Skip to content

Commit 7d463a2

Browse files
authored
Refactor transport version constants into new file system (elastic#133849) (elastic#133997)
This refactors ZERO, MINIMUM_COMPATIBLE, and MINIMUM_CCS_VERSION into TransportVersion.VersionsHolder and load them from /transport/constants/....
1 parent 73f8bfb commit 7d463a2

File tree

226 files changed

+314
-457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+314
-457
lines changed

docs/internal/Versioning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ for the previous minor release. An example of such an operation can be found
9090
The transport version used between two nodes is determined by the initial handshake
9191
(see `TransportHandshaker`, where the two nodes swap their highest known transport version).
9292
The lowest transport version that is compatible with the current node
93-
is determined by `TransportVersions.MINIMUM_COMPATIBLE`,
93+
is determined by `TransportVersion.minimumCompatible()`,
9494
and the node is prevented from joining the cluster if it is below that version.
9595
This constant should be updated manually on a major release.
9696

9797
The minimum version that can be used for CCS is determined by
98-
`TransportVersions.MINIMUM_CCS_VERSION`, but this is not actively checked
98+
`TransportVersion.minimumCCSVersion()`, but this is not actively checked
9999
before queries are performed. Only if a query cannot be serialized at that
100100
version is an action rejected. This constant is updated automatically
101101
as part of performing a release.

modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.apache.lucene.search.IndexSearcher;
1313
import org.elasticsearch.TransportVersion;
14-
import org.elasticsearch.TransportVersions;
1514
import org.elasticsearch.aggregations.bucket.adjacency.AdjacencyMatrixAggregator.KeyedFilter;
1615
import org.elasticsearch.common.io.stream.StreamInput;
1716
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -256,6 +255,6 @@ public String getType() {
256255

257256
@Override
258257
public TransportVersion getMinimalSupportedVersion() {
259-
return TransportVersions.ZERO;
258+
return TransportVersion.zero();
260259
}
261260
}

modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public boolean equals(Object obj) {
259259

260260
@Override
261261
public TransportVersion getMinimalSupportedVersion() {
262-
return TransportVersions.ZERO;
262+
return TransportVersion.zero();
263263
}
264264

265265
public static class RoundingInfo implements Writeable {

modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregationBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ public String getType() {
101101

102102
@Override
103103
public TransportVersion getMinimalSupportedVersion() {
104-
return TransportVersions.ZERO;
104+
return TransportVersion.zero();
105105
}
106106
}

modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/BucketSelectorPipelineAggregationBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.aggregations.pipeline;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.common.ParsingException;
1514
import org.elasticsearch.common.io.stream.StreamInput;
1615
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -217,6 +216,6 @@ public String getWriteableName() {
217216

218217
@Override
219218
public TransportVersion getMinimalSupportedVersion() {
220-
return TransportVersions.ZERO;
219+
return TransportVersion.zero();
221220
}
222221
}

modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/BucketSortPipelineAggregationBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
package org.elasticsearch.aggregations.pipeline;
1010

1111
import org.elasticsearch.TransportVersion;
12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.common.io.stream.StreamInput;
1413
import org.elasticsearch.common.io.stream.StreamOutput;
1514
import org.elasticsearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder;
@@ -196,6 +195,6 @@ public String getWriteableName() {
196195

197196
@Override
198197
public TransportVersion getMinimalSupportedVersion() {
199-
return TransportVersions.ZERO;
198+
return TransportVersion.zero();
200199
}
201200
}

modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/MovFnPipelineAggregationBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.aggregations.pipeline;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.common.Strings;
1514
import org.elasticsearch.common.io.stream.StreamInput;
1615
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -223,6 +222,6 @@ public String getWriteableName() {
223222

224223
@Override
225224
public TransportVersion getMinimalSupportedVersion() {
226-
return TransportVersions.ZERO;
225+
return TransportVersion.zero();
227226
}
228227
}

modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.elasticsearch.script.mustache;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.action.index.IndexRequestBuilder;
1414
import org.elasticsearch.action.search.SearchRequest;
1515
import org.elasticsearch.common.Strings;
@@ -210,7 +210,7 @@ public void testCCSCheckCompatibility() throws Exception {
210210
"[fail_before_current_version] was released first in version %s, failed compatibility "
211211
+ "check trying to send it to node with version %s",
212212
FailBeforeCurrentVersionQueryBuilder.FUTURE_VERSION.toReleaseVersion(),
213-
TransportVersions.MINIMUM_CCS_VERSION.toReleaseVersion()
213+
TransportVersion.minimumCCSVersion().toReleaseVersion()
214214
);
215215
String actualCause = ex.getCause().getMessage();
216216
assertEquals(expectedCause, actualCause);

modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ public void testIndexedTemplateWithArray() {
426426

427427
/**
428428
* Test that triggering the CCS compatibility check with a query that shouldn't go to the minor before
429-
* TransportVersions.MINIMUM_CCS_VERSION works
429+
* TransportVersion.minimumCCSVersion() works
430430
*/
431431
public void testCCSCheckCompatibility() throws Exception {
432432
String templateString = """

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureQueryBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.apache.lucene.search.MatchNoDocsQuery;
1414
import org.apache.lucene.search.Query;
1515
import org.elasticsearch.TransportVersion;
16-
import org.elasticsearch.TransportVersions;
1716
import org.elasticsearch.common.io.stream.StreamInput;
1817
import org.elasticsearch.common.io.stream.StreamOutput;
1918
import org.elasticsearch.index.mapper.MappedFieldType;
@@ -416,6 +415,6 @@ protected int doHashCode() {
416415

417416
@Override
418417
public TransportVersion getMinimalSupportedVersion() {
419-
return TransportVersions.ZERO;
418+
return TransportVersion.zero();
420419
}
421420
}

0 commit comments

Comments
 (0)