Skip to content

Commit 30a37c3

Browse files
authored
Re-remove min compatible version from SearchRequest (elastic#123859)
Re-apply transport changes from elastic#114713
1 parent 3b323dc commit 30a37c3

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ static TransportVersion def(int id) {
208208
public static final TransportVersion MULTI_PROJECT = def(9_018_0_00);
209209
public static final TransportVersion STORED_SCRIPT_CONTENT_LENGTH = def(9_019_0_00);
210210
public static final TransportVersion JINA_AI_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_020_0_00);
211+
public static final TransportVersion RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(9_021_0_00);
211212

212213
/*
213214
* STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/search/SearchRequest.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.elasticsearch.common.io.stream.StreamOutput;
2121
import org.elasticsearch.core.Nullable;
2222
import org.elasticsearch.core.TimeValue;
23-
import org.elasticsearch.core.UpdateForV9;
2423
import org.elasticsearch.index.mapper.SourceLoader;
2524
import org.elasticsearch.index.query.QueryRewriteContext;
2625
import org.elasticsearch.index.query.Rewriteable;
@@ -254,10 +253,8 @@ public SearchRequest(StreamInput in) throws IOException {
254253
finalReduce = true;
255254
}
256255
ccsMinimizeRoundtrips = in.readBoolean();
257-
if ((in.getTransportVersion().before(TransportVersions.REMOVE_MIN_COMPATIBLE_SHARD_NODE)
258-
|| in.getTransportVersion().onOrAfter(TransportVersions.REVERT_REMOVE_MIN_COMPATIBLE_SHARD_NODE)) && in.readBoolean()) {
259-
@UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // this can be removed (again) when the v9 transport version can diverge
260-
Version v = Version.readVersion(in); // and drop on the floor
256+
if (in.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE) && in.readBoolean()) {
257+
Version.readVersion(in); // and drop on the floor
261258
}
262259
waitForCheckpoints = in.readMap(StreamInput::readLongArray);
263260
waitForCheckpointsTimeout = in.readTimeValue();
@@ -293,8 +290,7 @@ public void writeTo(StreamOutput out) throws IOException {
293290
out.writeBoolean(finalReduce);
294291
}
295292
out.writeBoolean(ccsMinimizeRoundtrips);
296-
if (out.getTransportVersion().before(TransportVersions.REMOVE_MIN_COMPATIBLE_SHARD_NODE)
297-
|| out.getTransportVersion().onOrAfter(TransportVersions.REVERT_REMOVE_MIN_COMPATIBLE_SHARD_NODE)) {
293+
if (out.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE)) {
298294
out.writeBoolean(false);
299295
}
300296
out.writeMap(waitForCheckpoints, StreamOutput::writeLongArray);

0 commit comments

Comments
 (0)