Skip to content

Revert terms bwc disable #64233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 2, 2020
Merged

Revert terms bwc disable #64233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3799523
Revert "disable BWC tests that will fail with the new include/exclude…
not-napoleon Oct 27, 2020
f1ab38b
fix version number for BWC
not-napoleon Oct 27, 2020
11f50f0
Merge branch 'master' into revert-terms-bwc-disable
elasticmachine Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ setup:

---
"IP test":
- skip:
version: " - 7.99.99"
reason: "Skip until #64014 is merged (include exclude wire format change)"
- do:
index:
index: test_1
Expand Down Expand Up @@ -294,9 +291,6 @@ setup:

---
"Date test":
- skip:
version: " - 7.99.99"
reason: "Skip until #64014 is merged (include exclude wire format change)"
- do:
index:
index: test_1
Expand Down Expand Up @@ -368,9 +362,6 @@ setup:
---
"Partitioned string test":

- skip:
version: " - 7.99.99"
reason: "Skip until #64014 is merged (include exclude wire format change)"
- do:
index:
index: test_1
Expand Down Expand Up @@ -425,9 +416,6 @@ setup:
---
"Partitioned integer test":

- skip:
version: " - 7.99.99"
reason: "Skip until #64014 is merged (include exclude wire format change)"
- do:
index:
index: test_1
Expand Down
6 changes: 0 additions & 6 deletions rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/280_rare_terms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ setup:

---
"IP test":
- skip:
version: " - 7.99.99"
reason: "Skip until #64014 is merged (include exclude wire format change)"
- do:
index:
index: test_1
Expand Down Expand Up @@ -192,9 +189,6 @@ setup:

---
"Date test":
- skip:
version: " - 7.99.99"
reason: "Skip until #64014 is merged (include exclude wire format change)"
- do:
index:
index: test_1
Expand Down
3 changes: 0 additions & 3 deletions rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@

---
"IP test":
- skip:
version: " - 7.99.99"
reason: "Skip until #64014 is merged (include exclude wire format change)"
- do:
indices.create:
index: ip_index
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ public IncludeExclude(StreamInput in) throws IOException {
include = includeString == null ? null : new RegExp(includeString);
String excludeString = in.readOptionalString();
exclude = excludeString == null ? null : new RegExp(excludeString);
if (in.getVersion().before(Version.V_8_0_0)) {
if (in.getVersion().before(Version.V_7_11_0)) {
incZeroBasedPartition = 0;
incNumPartitions = 0;
includeValues = null;
Expand Down Expand Up @@ -440,7 +440,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (regexBased) {
out.writeOptionalString(include == null ? null : include.getOriginalString());
out.writeOptionalString(exclude == null ? null : exclude.getOriginalString());
if (out.getVersion().before(Version.V_8_0_0)) {
if (out.getVersion().before(Version.V_7_11_0)) {
return;
}
}
Expand Down