Browse Source

Revert terms bwc disable (#64233)

* Revert "disable BWC tests that will fail with the new include/exclude work (#64025)"

This reverts commit dc073d21d9edff52e9a3e2e8519441ea49e52fac.

* fix version number for BWC

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Mark Tozzi 5 years ago
parent
commit
f4e497e0bd

+ 0 - 12
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml

@@ -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
@@ -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
@@ -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
@@ -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

+ 0 - 6
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/280_rare_terms.yml

@@ -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
@@ -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

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yml

@@ -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

+ 2 - 2
server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java

@@ -400,7 +400,7 @@ public class IncludeExclude implements Writeable, ToXContentFragment {
             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;
@@ -440,7 +440,7 @@ public class IncludeExclude implements Writeable, ToXContentFragment {
         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;
             }
         }