Skip to content

Commit 90ea9d3

Browse files
authored
Remove V_8_0_0 transport version from tests (#135942)
This commit removes usages of V_8_0_0 from most tests. The vast majority of these tests are no longer applicable so the tests are deleted.
1 parent 5fea154 commit 90ea9d3

File tree

21 files changed

+16
-1397
lines changed

21 files changed

+16
-1397
lines changed

server/src/main/java/org/elasticsearch/action/fieldcaps/ResponseRewriter.java

Lines changed: 0 additions & 122 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ private static FieldCapabilitiesResponse merge(
469469
} else {
470470
subIndices = ArrayUtil.copyOfSubArray(indices, lastPendingIndex, i);
471471
}
472-
innerMerge(subIndices, fieldsBuilder, request, indexResponses[lastPendingIndex]);
472+
innerMerge(subIndices, fieldsBuilder, indexResponses[lastPendingIndex]);
473473
lastPendingIndex = i;
474474
}
475475
}
@@ -589,15 +589,9 @@ private static String nextIndex(Iterator<String> iter, Set<String> filtered) {
589589
private static void innerMerge(
590590
String[] indices,
591591
Map<String, Map<String, FieldCapabilities.Builder>> responseMapBuilder,
592-
FieldCapabilitiesRequest request,
593592
FieldCapabilitiesIndexResponse response
594593
) {
595-
Map<String, IndexFieldCapabilities> fields = ResponseRewriter.rewriteOldResponses(
596-
response.getOriginVersion(),
597-
response.get(),
598-
request.filters(),
599-
request.types()
600-
);
594+
Map<String, IndexFieldCapabilities> fields = response.get();
601595
for (Map.Entry<String, IndexFieldCapabilities> entry : fields.entrySet()) {
602596
final String field = entry.getKey();
603597
final IndexFieldCapabilities fieldCap = entry.getValue();

server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java

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

1010
package org.elasticsearch.action.admin.cluster.reroute;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.Version;
1414
import org.elasticsearch.cluster.ClusterName;
1515
import org.elasticsearch.cluster.ClusterState;
@@ -132,7 +132,7 @@ public void testToXContentWithDeprecatedClusterState() {
132132
"nodes_versions": [
133133
{
134134
"node_id": "node0",
135-
"transport_version": "8000099",
135+
"transport_version": "%s",
136136
"mappings_versions": {
137137
".system-index": {
138138
"version": 1,
@@ -218,6 +218,7 @@ public void testToXContentWithDeprecatedClusterState() {
218218
Version.CURRENT,
219219
IndexVersions.MINIMUM_COMPATIBLE,
220220
IndexVersion.current(),
221+
TransportVersion.current(),
221222
IndexVersion.current(),
222223
IndexVersion.current()
223224
),
@@ -333,7 +334,7 @@ private static ClusterState createClusterState() {
333334
.nodes(new DiscoveryNodes.Builder().add(node0).masterNodeId(node0.getId()).build())
334335
.putCompatibilityVersions(
335336
node0.getId(),
336-
TransportVersions.V_8_0_0,
337+
TransportVersion.current(),
337338
Map.of(".system-index", new SystemIndexDescriptor.MappingsVersion(1, 0))
338339
)
339340
.metadata(

server/src/test/java/org/elasticsearch/action/fieldcaps/ResponseRewriterTests.java

Lines changed: 0 additions & 152 deletions
This file was deleted.

server/src/test/java/org/elasticsearch/action/search/OpenPointInTimeRequestTests.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,11 @@
99

1010
package org.elasticsearch.action.search;
1111

12-
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
14-
import org.elasticsearch.common.io.stream.BytesStreamOutput;
15-
import org.elasticsearch.common.io.stream.NamedWriteableAwareStreamInput;
16-
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
17-
import org.elasticsearch.common.io.stream.StreamInput;
1812
import org.elasticsearch.common.io.stream.Writeable;
1913
import org.elasticsearch.core.TimeValue;
2014
import org.elasticsearch.test.AbstractWireSerializingTestCase;
21-
import org.elasticsearch.test.TransportVersionUtils;
2215

2316
import java.io.IOException;
24-
import java.util.List;
2517

2618
import static org.hamcrest.Matchers.equalTo;
2719

@@ -95,19 +87,4 @@ protected OpenPointInTimeRequest mutateInstance(OpenPointInTimeRequest in) throw
9587
default -> throw new AssertionError("Unknown option");
9688
};
9789
}
98-
99-
public void testUseDefaultConcurrentForOldVersion() throws Exception {
100-
TransportVersion previousVersion = TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_9_X);
101-
try (BytesStreamOutput output = new BytesStreamOutput()) {
102-
TransportVersion version = TransportVersionUtils.randomVersionBetween(random(), TransportVersions.V_8_0_0, previousVersion);
103-
output.setTransportVersion(version);
104-
OpenPointInTimeRequest original = createTestInstance();
105-
original.writeTo(output);
106-
try (StreamInput in = new NamedWriteableAwareStreamInput(output.bytes().streamInput(), new NamedWriteableRegistry(List.of()))) {
107-
in.setTransportVersion(version);
108-
OpenPointInTimeRequest copy = new OpenPointInTimeRequest(in);
109-
assertThat(copy.maxConcurrentShardRequests(), equalTo(5));
110-
}
111-
}
112-
}
11390
}

server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java

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

1212
import org.elasticsearch.ElasticsearchParseException;
1313
import org.elasticsearch.TransportVersion;
14-
import org.elasticsearch.TransportVersions;
1514
import org.elasticsearch.cluster.Diff;
1615
import org.elasticsearch.common.Strings;
1716
import org.elasticsearch.common.bytes.BytesReference;
@@ -620,7 +619,7 @@ public void testMissingValue() throws Exception {
620619

621620
public void testReadWriteArray() throws IOException {
622621
BytesStreamOutput output = new BytesStreamOutput();
623-
output.setTransportVersion(randomFrom(TransportVersion.current(), TransportVersions.V_8_0_0));
622+
output.setTransportVersion(TransportVersion.current());
624623
Settings settings = Settings.builder().putList("foo.bar", "0", "1", "2", "3").put("foo.bar.baz", "baz").build();
625624
settings.writeTo(output);
626625
StreamInput in = StreamInput.wrap(BytesReference.toBytes(output.bytes()));

0 commit comments

Comments
 (0)