Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ static TransportVersion def(int id) {
* READ THE COMMENT BELOW THIS BLOCK OF DECLARATIONS BEFORE ADDING NEW TRANSPORT VERSIONS
* Detached transport versions added below here.
*/
public static final TransportVersion V_8_11_X = def(8_512_0_01);
public static final TransportVersion V_8_12_0 = def(8_560_0_00);
public static final TransportVersion V_8_12_1 = def(8_560_0_01);
public static final TransportVersion V_8_13_0 = def(8_595_0_00);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,9 @@ public NodeInfo(StreamInput in) throws IOException {
Version legacyVersion = Version.readVersion(in);
version = legacyVersion.toString();
compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions;
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
indexVersion = IndexVersion.readVersion(in);
} else {
indexVersion = IndexVersion.fromId(legacyVersion.id);
}
}
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
componentVersions = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt);
} else {
componentVersions = Map.of();
indexVersion = IndexVersion.readVersion(in);
}
componentVersions = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt);
build = Build.readBuild(in);
if (in.readBoolean()) {
totalIndexingBuffer = ByteSizeValue.ofBytes(in.readLong());
Expand Down Expand Up @@ -242,10 +234,8 @@ public void writeTo(StreamOutput out) throws IOException {
Version.writeVersion(Version.fromString(version), out);
}
compatibilityVersions.writeTo(out);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
IndexVersion.writeVersion(indexVersion, out);
out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt);
}
IndexVersion.writeVersion(indexVersion, out);
out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt);
Build.writeBuild(build, out);
if (totalIndexingBuffer == null) {
out.writeBoolean(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import java.util.Map;
import java.util.Objects;

import static org.elasticsearch.TransportVersions.V_8_11_X;
import static org.elasticsearch.cluster.metadata.DataStream.AUTO_SHARDING_FIELD;

public class GetDataStreamAction extends ActionType<GetDataStreamAction.Response> {
Expand Down Expand Up @@ -340,10 +339,8 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalString(indexTemplate);
out.writeOptionalString(ilmPolicyName);
out.writeOptionalWriteable(timeSeries);
if (out.getTransportVersion().onOrAfter(V_8_11_X)) {
out.writeMap(indexSettingsValues);
out.writeBoolean(templatePreferIlmValue);
}
out.writeMap(indexSettingsValues);
out.writeBoolean(templatePreferIlmValue);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
out.writeOptionalVLong(maximumTimestamp);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,7 @@ static List<FieldCapabilitiesIndexResponse> readList(StreamInput input) throws I
responses.add(new FieldCapabilitiesIndexResponse(input));
}
final int groups = input.readVInt();
if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
collectCompressedResponses(input, groups, responses);
} else {
collectResponsesLegacyFormat(input, groups, responses);
}
collectCompressedResponses(input, groups, responses);
return responses;
}

Expand Down Expand Up @@ -139,11 +135,7 @@ static void writeList(StreamOutput output, List<FieldCapabilitiesIndexResponse>
}

output.writeCollection(ungroupedResponses);
if (output.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
writeCompressedResponses(output, groupedResponsesMap);
} else {
writeResponsesLegacyFormat(output, groupedResponsesMap);
}
writeCompressedResponses(output, groupedResponsesMap);
}

private static void writeResponsesLegacyFormat(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

package org.elasticsearch.action.search;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.OriginalIndices;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -914,11 +913,7 @@ public Cluster(StreamInput in) throws IOException {
}
this.timedOut = in.readBoolean();
this.failures = Collections.unmodifiableList(in.readCollectionAsList(ShardSearchFailure::readShardSearchFailure));
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
this.skipUnavailable = in.readBoolean();
} else {
this.skipUnavailable = SKIP_UNAVAILABLE_DEFAULT;
}
this.skipUnavailable = in.readBoolean();
}

/**
Expand Down Expand Up @@ -1019,9 +1014,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalLong(took == null ? null : took.millis());
out.writeBoolean(timedOut);
out.writeCollection(failures);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
out.writeBoolean(skipUnavailable);
}
out.writeBoolean(skipUnavailable);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.cluster.version;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
Expand Down Expand Up @@ -109,9 +108,7 @@ public static CompatibilityVersions readVersion(StreamInput in) throws IOExcepti
TransportVersion transportVersion = TransportVersion.readVersion(in);

Map<String, SystemIndexDescriptor.MappingsVersion> mappingsVersions = Map.of();
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
mappingsVersions = in.readMap(SystemIndexDescriptor.MappingsVersion::new);
}
mappingsVersions = in.readMap(SystemIndexDescriptor.MappingsVersion::new);

return new CompatibilityVersions(transportVersion, mappingsVersions);
}
Expand All @@ -120,9 +117,7 @@ public static CompatibilityVersions readVersion(StreamInput in) throws IOExcepti
public void writeTo(StreamOutput out) throws IOException {
TransportVersion.writeVersion(this.transportVersion(), out);

if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
out.writeMap(this.systemIndexMappingsVersion(), StreamOutput::writeWriteable);
}
out.writeMap(this.systemIndexMappingsVersion(), StreamOutput::writeWriteable);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.ParseField;
Expand Down Expand Up @@ -101,7 +100,7 @@ public final String getWriteableName() {

@Override
public final TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_8_11_X;
return TransportVersion.minimumCompatible();
}

protected static class GeoBoundsParser extends BoundsParser<GeoBoundingBox> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

package org.elasticsearch.indices.recovery;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down Expand Up @@ -44,11 +43,7 @@ public StartRecoveryRequest(StreamInput in) throws IOException {
targetAllocationId = in.readString();
sourceNode = new DiscoveryNode(in);
targetNode = new DiscoveryNode(in);
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
clusterStateVersion = in.readVLong();
} else {
clusterStateVersion = 0L; // bwc: do not wait for cluster state to be applied
}
clusterStateVersion = in.readVLong();
metadataSnapshot = Store.MetadataSnapshot.readFrom(in);
primaryRelocation = in.readBoolean();
startingSeqNo = in.readLong();
Expand Down Expand Up @@ -161,9 +156,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeString(targetAllocationId);
sourceNode.writeTo(out);
targetNode.writeTo(out);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
out.writeVLong(clusterStateVersion);
} // else bwc: just omit it, the receiver doesn't wait for a cluster state anyway
out.writeVLong(clusterStateVersion);
metadataSnapshot.writeTo(out);
out.writeBoolean(primaryRelocation);
out.writeLong(startingSeqNo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_8_11_X;
return TransportVersion.minimumCompatible();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.inference;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.VersionedNamedWriteable;
Expand Down Expand Up @@ -70,7 +69,7 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_8_11_X;
return TransportVersion.minimumCompatible();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

import java.io.IOException;

import static org.elasticsearch.TransportVersions.V_8_11_X;

public class DfsKnnResults implements Writeable {
private final String nestedPath;
private final ScoreDoc[] scoreDocs;
Expand All @@ -30,11 +28,7 @@ public DfsKnnResults(String nestedPath, ScoreDoc[] scoreDocs) {

public DfsKnnResults(StreamInput in) throws IOException {
scoreDocs = in.readArray(Lucene::readScoreDoc, ScoreDoc[]::new);
if (in.getTransportVersion().onOrAfter(V_8_11_X)) {
nestedPath = in.readOptionalString();
} else {
nestedPath = null;
}
nestedPath = in.readOptionalString();
}

public String getNestedPath() {
Expand All @@ -47,8 +41,6 @@ public ScoreDoc[] scoreDocs() {

public void writeTo(StreamOutput out) throws IOException {
out.writeArray(Lucene::writeScoreDoc, scoreDocs);
if (out.getTransportVersion().onOrAfter(V_8_11_X)) {
out.writeOptionalString(nestedPath);
}
out.writeOptionalString(nestedPath);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import java.util.Objects;
import java.util.function.Supplier;

import static org.elasticsearch.TransportVersions.V_8_11_X;
import static org.elasticsearch.common.Strings.format;
import static org.elasticsearch.index.query.AbstractQueryBuilder.DEFAULT_BOOST;
import static org.elasticsearch.search.SearchService.DEFAULT_SIZE;
Expand Down Expand Up @@ -347,9 +346,7 @@ public KnnSearchBuilder(StreamInput in) throws IOException {
this.queryVectorBuilder = in.readOptionalNamedWriteable(QueryVectorBuilder.class);
this.querySupplier = null;
this.similarity = in.readOptionalFloat();
if (in.getTransportVersion().onOrAfter(V_8_11_X)) {
this.innerHitBuilder = in.readOptionalWriteable(InnerHitBuilder::new);
}
this.innerHitBuilder = in.readOptionalWriteable(InnerHitBuilder::new);
this.rescoreVectorBuilder = in.readOptional(RescoreVectorBuilder::new);
}

Expand Down Expand Up @@ -603,9 +600,7 @@ public void writeTo(StreamOutput out) throws IOException {
}
out.writeOptionalNamedWriteable(queryVectorBuilder);
out.writeOptionalFloat(similarity);
if (out.getTransportVersion().onOrAfter(V_8_11_X)) {
out.writeOptionalWriteable(innerHitBuilder);
}
out.writeOptionalWriteable(innerHitBuilder);
out.writeOptionalWriteable(rescoreVectorBuilder);
}

Expand Down
11 changes: 0 additions & 11 deletions server/src/test/java/org/elasticsearch/BuildTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.EqualsHashCodeTestUtils;
import org.elasticsearch.test.TransportVersionUtils;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -90,16 +89,6 @@ public void testStrictTypeParsing() {
assertThat(e, hasToString(containsString("unexpected distribution type [" + displayName + "]; your distribution is broken")));
}

public void testSerializationQualifierBwc() throws IOException {
var randomBuild = new WriteableBuild(randomBuild());
var serializationVersion = TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_12_0);
var roundtrip = copyWriteable(randomBuild, writableRegistry(), WriteableBuild::new, serializationVersion);
assertThat(roundtrip.build.version(), equalTo(randomBuild.build.version()));
assertThat(roundtrip.build.qualifier(), equalTo(randomBuild.build.qualifier()));
assertThat(roundtrip.build.isSnapshot(), equalTo(randomBuild.build.isSnapshot()));
assertThat(roundtrip.build.displayString(), equalTo(randomBuild.build.displayString()));
}

private static Build randomBuild() {
return new Build(
randomAlphaOfLength(6),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.indices.recovery;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.Version;
import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
import org.elasticsearch.common.UUIDs;
Expand Down Expand Up @@ -76,11 +75,7 @@ public void testSerialization() throws Exception {
assertThat(outRequest.recoveryId(), equalTo(inRequest.recoveryId()));
assertThat(outRequest.startingSeqNo(), equalTo(inRequest.startingSeqNo()));

if (serializationVersion.onOrAfter(TransportVersions.V_8_11_X)) {
assertEquals(outRequest.clusterStateVersion(), inRequest.clusterStateVersion());
} else {
assertEquals(0L, inRequest.clusterStateVersion());
}
assertEquals(outRequest.clusterStateVersion(), inRequest.clusterStateVersion());
}

public void testDescription() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.Explicit;
import org.elasticsearch.common.io.stream.ByteArrayStreamInput;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
Expand Down Expand Up @@ -342,11 +341,7 @@ && coerce()
assert count >= 0;
// we do not add elements with count == 0
if (count > 0) {
if (streamOutput.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
streamOutput.writeVLong(count);
} else {
streamOutput.writeVInt(Math.toIntExact(count));
}
streamOutput.writeVLong(count);
streamOutput.writeLong(Double.doubleToRawLongBits(parsedHistogram.values().get(i)));
}
}
Expand Down Expand Up @@ -413,11 +408,7 @@ void reset(BytesRef bytesRef) {
@Override
public boolean next() throws IOException {
if (streamInput.available() > 0) {
if (streamInput.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
count = streamInput.readVLong();
} else {
count = streamInput.readVInt();
}
count = streamInput.readVLong();
value = Double.longBitsToDouble(streamInput.readLong());
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.elasticsearch.xpack.core.esql;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -36,7 +35,9 @@ private EsqlFeatureSetUsage(boolean available, boolean enabled, Map<String, Obje
this.stats = stats;
}

/** Returns a feature set usage where the feature is not available or enabled, and has an empty stats. */
/**
* Returns a feature set usage where the feature is not available or enabled, and has an empty stats.
*/
public static EsqlFeatureSetUsage unavailable() {
return new EsqlFeatureSetUsage(false, false, Map.of());
}
Expand All @@ -63,7 +64,7 @@ public void writeTo(StreamOutput out) throws IOException {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_8_11_X;
return TransportVersion.minimumCompatible();
}

}
Loading