Skip to content

Commit f89420e

Browse files
authored
field_caps: adapt bwc version after backport (#41427)
1 parent 180deaa commit f89420e

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ task verifyVersions {
162162
* after the backport of the backcompat code is complete.
163163
*/
164164

165-
boolean bwc_tests_enabled = true
166-
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
165+
boolean bwc_tests_enabled = false
166+
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/41426" /* place a PR link here when committing bwc changes */
167167
if (bwc_tests_enabled == false) {
168168
if (bwc_tests_disabled_issue.isEmpty()) {
169169
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ setup:
298298
---
299299
"Field caps with include_unmapped":
300300
- skip:
301-
version: " - 7.99.99"
301+
version: " - 7.0.99"
302302
reason: include_unmapped has been added in 7.1.0
303303

304304
- do:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void readFrom(StreamInput in) throws IOException {
8484
indices = in.readStringArray();
8585
indicesOptions = IndicesOptions.readIndicesOptions(in);
8686
mergeResults = in.readBoolean();
87-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
87+
if (in.getVersion().onOrAfter(Version.V_7_1_0)) {
8888
includeUnmapped = in.readBoolean();
8989
} else {
9090
includeUnmapped = false;
@@ -98,7 +98,7 @@ public void writeTo(StreamOutput out) throws IOException {
9898
out.writeStringArray(indices);
9999
indicesOptions.writeIndicesOptions(out);
100100
out.writeBoolean(mergeResults);
101-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
101+
if (out.getVersion().onOrAfter(Version.V_7_1_0)) {
102102
out.writeBoolean(includeUnmapped);
103103
}
104104
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public Map<String, FieldCapabilities> getField(String field) {
108108
@Override
109109
public void readFrom(StreamInput in) throws IOException {
110110
super.readFrom(in);
111-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
111+
if (in.getVersion().onOrAfter(Version.V_7_1_0)) {
112112
indices = in.readStringArray();
113113
} else {
114114
indices = Strings.EMPTY_ARRAY;
@@ -124,7 +124,7 @@ private static Map<String, FieldCapabilities> readField(StreamInput in) throws I
124124
@Override
125125
public void writeTo(StreamOutput out) throws IOException {
126126
super.writeTo(out);
127-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
127+
if (out.getVersion().onOrAfter(Version.V_7_1_0)) {
128128
out.writeStringArray(indices);
129129
}
130130
out.writeMap(responseMap, StreamOutput::writeString, FieldCapabilitiesResponse::writeField);

0 commit comments

Comments
 (0)