Skip to content

Commit

Permalink
Remove references to transport versions 7.3 and 7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
thecoop committed Dec 9, 2024
1 parent 5e859d9 commit 2810335
Show file tree
Hide file tree
Showing 22 changed files with 31 additions and 89 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,13 @@ public AutoDateHistogramAggregationBuilder(String name) {
public AutoDateHistogramAggregationBuilder(StreamInput in) throws IOException {
super(in);
numBuckets = in.readVInt();
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
minimumIntervalExpression = in.readOptionalString();
}
minimumIntervalExpression = in.readOptionalString();
}

@Override
protected void innerWriteTo(StreamOutput out) throws IOException {
out.writeVInt(numBuckets);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
out.writeOptionalString(minimumIntervalExpression);
}
out.writeOptionalString(minimumIntervalExpression);
}

protected AutoDateHistogramAggregationBuilder(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,6 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public String toString() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}

public record Entry(String repository, long repositoryStateId) implements Writeable, RepositoryOperation {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,6 @@ public String getType() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_3_0;
return TransportVersions.ZERO;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,6 @@ public String getType() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_3_0;
return TransportVersions.ZERO;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,6 @@ public String getType() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_3_0;
return TransportVersions.ZERO;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,6 @@ protected boolean overrideBucketsPath() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
package org.elasticsearch.xpack.ccr.action;

import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionResponse;
Expand Down Expand Up @@ -268,11 +267,7 @@ public long getTookInMillis() {
super(in);
mappingVersion = in.readVLong();
settingsVersion = in.readVLong();
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
aliasesVersion = in.readVLong();
} else {
aliasesVersion = 0;
}
aliasesVersion = in.readVLong();
globalCheckpoint = in.readZLong();
maxSeqNo = in.readZLong();
maxSeqNoOfUpdatesOrDeletes = in.readZLong();
Expand Down Expand Up @@ -304,9 +299,7 @@ public long getTookInMillis() {
public void writeTo(final StreamOutput out) throws IOException {
out.writeVLong(mappingVersion);
out.writeVLong(settingsVersion);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
out.writeVLong(aliasesVersion);
}
out.writeVLong(aliasesVersion);
out.writeZLong(globalCheckpoint);
out.writeZLong(maxSeqNo);
out.writeZLong(maxSeqNoOfUpdatesOrDeletes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,27 +328,15 @@ public FeatureSet(String name, boolean available, boolean enabled) {
}

public FeatureSet(StreamInput in) throws IOException {
this(in.readString(), readAvailable(in), in.readBoolean());
this(in.readString(), in.readBoolean(), in.readBoolean());
if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
in.readGenericMap(); // backcompat reading native code info, but no longer used here
}
}

// this is separated out so that the removed description can be read from the stream on construction
// TODO: remove this for 8.0
private static boolean readAvailable(StreamInput in) throws IOException {
if (in.getTransportVersion().before(TransportVersions.V_7_3_0)) {
in.readOptionalString();
}
return in.readBoolean();
}

@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
if (out.getTransportVersion().before(TransportVersions.V_7_3_0)) {
out.writeOptionalString(null);
}
out.writeBoolean(available);
out.writeBoolean(enabled);
if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected void innerXContent(XContentBuilder builder, Params params) throws IOEx

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.elasticsearch.xpack.core.ccr;

import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -413,11 +412,7 @@ public ShardFollowNodeTaskStatus(final StreamInput in) throws IOException {
this.writeBufferSizeInBytes = in.readVLong();
this.followerMappingVersion = in.readVLong();
this.followerSettingsVersion = in.readVLong();
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
this.followerAliasesVersion = in.readVLong();
} else {
this.followerAliasesVersion = 0L;
}
this.followerAliasesVersion = in.readVLong();
this.totalReadTimeMillis = in.readVLong();
this.totalReadRemoteExecTimeMillis = in.readVLong();
this.successfulReadRequests = in.readVLong();
Expand Down Expand Up @@ -457,9 +452,7 @@ public void writeTo(final StreamOutput out) throws IOException {
out.writeVLong(writeBufferSizeInBytes);
out.writeVLong(followerMappingVersion);
out.writeVLong(followerSettingsVersion);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
out.writeVLong(followerAliasesVersion);
}
out.writeVLong(followerAliasesVersion);
out.writeVLong(totalReadTimeMillis);
out.writeVLong(totalReadRemoteExecTimeMillis);
out.writeVLong(successfulReadRequests);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public FrozenIndicesFeatureSetUsage(StreamInput input) throws IOException {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ public String toString() {
public static class TaskParams implements PersistentTaskParams, MlTaskParams {

public static final MlConfigVersion VERSION_INTRODUCED = MlConfigVersion.V_7_3_0;
public static final TransportVersion TRANSPORT_VERSION_INTRODUCED = TransportVersions.V_7_3_0;
public static final MlConfigVersion VERSION_DESTINATION_INDEX_MAPPINGS_CHANGED = MlConfigVersion.V_7_10_0;

public static final ConstructingObjectParser<TaskParams, Void> PARSER = new ConstructingObjectParser<>(
Expand Down Expand Up @@ -207,7 +206,7 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TRANSPORT_VERSION_INTRODUCED;
return TransportVersions.ZERO;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,7 @@ public InvalidateApiKeyRequest(StreamInput in) throws IOException {
}
validateIds(ids);
name = textOrNull(in.readOptionalString());
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_4_0)) {
ownedByAuthenticatedUser = in.readOptionalBoolean();
} else {
ownedByAuthenticatedUser = false;
}
ownedByAuthenticatedUser = in.readOptionalBoolean();
}

public InvalidateApiKeyRequest(
Expand Down Expand Up @@ -223,9 +219,7 @@ public void writeTo(StreamOutput out) throws IOException {
}
}
out.writeOptionalString(name);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_4_0)) {
out.writeOptionalBoolean(ownedByAuthenticatedUser);
}
out.writeOptionalBoolean(ownedByAuthenticatedUser);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/
package org.elasticsearch.xpack.core.security.action.oidc;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -54,10 +53,7 @@ public OpenIdConnectAuthenticateRequest(StreamInput in) throws IOException {
redirectUri = in.readString();
state = in.readString();
nonce = in.readString();
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_4_0)) {
realm = in.readOptionalString();
}

realm = in.readOptionalString();
}

public String getRedirectUri() {
Expand Down Expand Up @@ -113,9 +109,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeString(redirectUri);
out.writeString(state);
out.writeString(nonce);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_4_0)) {
out.writeOptionalString(realm);
}
out.writeOptionalString(realm);
}

public String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}

@Override
Expand Down Expand Up @@ -226,7 +226,7 @@ static Diff<SnapshotLifecyclePolicyMetadata> readLifecyclePolicyDiffFrom(StreamI

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public SpatialFeatureSetUsage(StreamInput input) throws IOException {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}

SpatialStatsAction.Response statsResponse() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,20 +131,11 @@ public TransformState(
public TransformState(StreamInput in) throws IOException {
taskState = TransformTaskState.fromStream(in);
indexerState = IndexerState.fromStream(in);
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
position = in.readOptionalWriteable(TransformIndexerPosition::new);
} else {
Map<String, Object> pos = in.readGenericMap();
position = new TransformIndexerPosition(pos, null);
}
position = in.readOptionalWriteable(TransformIndexerPosition::new);
checkpoint = in.readLong();
reason = in.readOptionalString();
progress = in.readOptionalWriteable(TransformProgress::new);
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
node = in.readOptionalWriteable(NodeAttributes::new);
} else {
node = null;
}
node = in.readOptionalWriteable(NodeAttributes::new);
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
shouldStopAtNextCheckpoint = in.readBoolean();
} else {
Expand Down Expand Up @@ -241,17 +232,11 @@ public String getWriteableName() {
public void writeTo(StreamOutput out) throws IOException {
taskState.writeTo(out);
indexerState.writeTo(out);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
out.writeOptionalWriteable(position);
} else {
out.writeGenericMap(position != null ? position.getIndexerPosition() : null);
}
out.writeOptionalWriteable(position);
out.writeLong(checkpoint);
out.writeOptionalString(reason);
out.writeOptionalWriteable(progress);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
out.writeOptionalWriteable(node);
}
out.writeOptionalWriteable(node);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
out.writeBoolean(shouldStopAtNextCheckpoint);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public VotingOnlyNodeFeatureSetUsage() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_3_0;
return TransportVersions.ZERO;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,6 @@ protected boolean doEquals(PinnedQueryBuilder other) {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,6 @@ public static ShapeQueryBuilder fromXContent(XContentParser parser) throws IOExc

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.V_7_4_0;
return TransportVersions.ZERO;
}
}

0 comments on commit 2810335

Please sign in to comment.