Skip to content

Commit e0d57c5

Browse files
committed
Correct the serialization version for index field caps.
It needs to be lowered to 7.7 now that the PR has been backported.
1 parent 375e39e commit e0d57c5

File tree

3 files changed

+6
-27
lines changed

3 files changed

+6
-27
lines changed

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ setup:
106106

107107
---
108108
"Get simple field caps":
109-
- skip:
110-
version: "all"
111-
reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/51896"
112109

113110
- do:
114111
field_caps:
@@ -175,9 +172,6 @@ setup:
175172

176173
---
177174
"Get leaves field caps":
178-
- skip:
179-
version: "all"
180-
reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/51896"
181175

182176
- do:
183177
field_caps:
@@ -206,9 +200,6 @@ setup:
206200
- is_false: fields.object\.nested2.keyword.non_searchable_indices
207201
---
208202
"Get object and nested field caps":
209-
- skip:
210-
version: "all"
211-
reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/51896"
212203

213204
- do:
214205
field_caps:
@@ -247,9 +238,6 @@ setup:
247238
- is_false: fields.level1\.level2\.leaf1.text..non_searchable_indices
248239
---
249240
"Get prefix field caps":
250-
- skip:
251-
version: "all"
252-
reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/51896"
253241

254242
- do:
255243
field_caps:
@@ -268,9 +256,6 @@ setup:
268256

269257
---
270258
"Mix in non-existing field field caps":
271-
- skip:
272-
version: "all"
273-
reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/51896"
274259

275260
- do:
276261
field_caps:
@@ -311,11 +296,8 @@ setup:
311296
---
312297
"Field caps with include_unmapped":
313298
- skip:
314-
version: "all"
315-
reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/51896"
316-
# - skip:
317-
# version: " - 7.1.99"
318-
# reason: include_unmapped has been added in 7.2.0
299+
version: " - 7.1.99"
300+
reason: include_unmapped has been added in 7.2.0
319301

320302
- do:
321303
field_caps:

rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/20_meta.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
---
22
"Merge metadata across multiple indices":
33
- skip:
4-
version: "all"
5-
reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/51896"
6-
# - skip:
7-
# version: " - 7.5.99"
8-
# reason: Metadata support was added in 7.6
4+
version: " - 7.5.99"
5+
reason: Metadata support was added in 7.6
96

107
- do:
118
indices.create:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class IndexFieldCapabilities implements Writeable {
6060
}
6161

6262
IndexFieldCapabilities(StreamInput in) throws IOException {
63-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
63+
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
6464
this.name = in.readString();
6565
this.type = in.readString();
6666
this.isSearchable = in.readBoolean();
@@ -81,7 +81,7 @@ public class IndexFieldCapabilities implements Writeable {
8181

8282
@Override
8383
public void writeTo(StreamOutput out) throws IOException {
84-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
84+
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
8585
out.writeString(name);
8686
out.writeString(type);
8787
out.writeBoolean(isSearchable);

0 commit comments

Comments
 (0)