Skip to content

Commit 722f2b6

Browse files
pabloempabloem
authored
Merge branch 'main' into pem-rate-rnd-tst
2 parents 6a9fe3e + 8d9f038 commit 722f2b6

File tree

305 files changed

+1024
-862
lines changed

Some content is hidden

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

305 files changed

+1024
-862
lines changed

‎docs/internal/Versioning.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ This is an optional cleanup step that is never required for correctness.
109109
The transport version used between two nodes is determined by the initial handshake
110110
(see `TransportHandshaker`, where the two nodes swap their highest known transport version).
111111
The lowest transport version that is compatible with the current node
112-
is determined by `TransportVersions.MINIMUM_COMPATIBLE`,
112+
is determined by `TransportVersion.minimumCompatible()`,
113113
and the node is prevented from joining the cluster if it is below that version.
114114
This constant should be updated manually on a major release.
115115

116116
The minimum version that can be used for CCS is determined by
117-
`TransportVersions.MINIMUM_CCS_VERSION`, but this is not actively checked
117+
`TransportVersion.minimumCCSVersion()`, but this is not actively checked
118118
before queries are performed. Only if a query cannot be serialized at that
119119
version is an action rejected. This constant is updated automatically
120120
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.aggregations.bucket.histogram;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.common.Rounding;
1514
import org.elasticsearch.common.io.stream.StreamInput;
1615
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -255,7 +254,7 @@ public boolean equals(Object obj) {
255254

256255
@Override
257256
public TransportVersion getMinimalSupportedVersion() {
258-
return TransportVersions.ZERO;
257+
return TransportVersion.zero();
259258
}
260259

261260
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/DerivativePipelineAggregationBuilder.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.Rounding;
1615
import org.elasticsearch.common.io.stream.StreamInput;
@@ -259,6 +258,6 @@ public String getWriteableName() {
259258

260259
@Override
261260
public TransportVersion getMinimalSupportedVersion() {
262-
return TransportVersions.ZERO;
261+
return TransportVersion.zero();
263262
}
264263
}

‎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/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpTaskParams.java‎

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

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.common.io.stream.StreamInput;
1514
import org.elasticsearch.common.io.stream.StreamOutput;
1615
import org.elasticsearch.persistent.PersistentTaskParams;
@@ -44,7 +43,7 @@ public String getWriteableName() {
4443

4544
@Override
4645
public TransportVersion getMinimalSupportedVersion() {
47-
return TransportVersions.ZERO;
46+
return TransportVersion.zero();
4847
}
4948

5049
@Override

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpTaskState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public String getWriteableName() {
133133

134134
@Override
135135
public TransportVersion getMinimalSupportedVersion() {
136-
return TransportVersions.ZERO;
136+
return TransportVersion.zero();
137137
}
138138

139139
@Override

0 commit comments

Comments
 (0)