Merge remote-tracking branch 'upstream/geoshape-doc-values' into tl-d…

…v-geoshape
elastic · May 1, 2019 · 088bb1d · 088bb1d
2 parents cf57f71 + 0f6bd6e
commit 088bb1d
Show file tree

Hide file tree

Showing 94 changed files with 1,088 additions and 348 deletions.
diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc
@@ -37,8 +37,14 @@ required. For more information, see
 {xpack-ref}/encrypting-data.html[Encrypting sensitive data in {watcher}].
 
 `xpack.watcher.history.cleaner_service.enabled`::
+ifdef::asciidoctor[]
+added:[6.3.0,Default changed to `true`.]
+deprecated:[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy]
+endif::[]
+ifndef::asciidoctor[]
 added[6.3.0,Default changed to `true`.]
 deprecated[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy]
+endif::[]
 +
 Set to `true` (default) to enable the cleaner service. If this setting is
 `true`, the `xpack.monitoring.enabled` setting must also be set to `true` with

diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/70_intervals.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/70_intervals.yml
@@ -23,8 +23,8 @@ setup:
 ---
 "Test use_field":
   - skip:
-      version: " - 7.0.99"
-      reason: "Implemented in 7.1"
+      version: " - 7.1.99"
+      reason: "Implemented in 7.2"
   - do:
       search:
         index: test

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/dense-vector/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/dense-vector/10_basic.yml
@@ -1,8 +1,8 @@
 setup:
   - skip:
       features: headers
-      version: " - 7.0.99"
-      reason: "dense_vector functions were introduced in 7.1.0"
+      version: " - 7.1.99"
+      reason: "dense_vector functions were introduced in 7.2.0"
 
   - do:
       indices.create:

diff --git a/...les/mapper-extras/src/test/resources/rest-api-spec/test/dense-vector/20_special_cases.yml b/...les/mapper-extras/src/test/resources/rest-api-spec/test/dense-vector/20_special_cases.yml
@@ -1,8 +1,8 @@
 setup:
   - skip:
       features: headers
-      version: " - 7.0.99"
-      reason: "dense_vector functions were introduced in 7.1.0"
+      version: " - 7.1.99"
+      reason: "dense_vector functions were introduced in 7.2.0"
 
   - do:
       indices.create:

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/search-as-you-type/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/search-as-you-type/10_basic.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 7.0.99"
-      reason: "added in 7.1.0"
+      version: " - 7.1.99"
+      reason: "added in 7.2.0"
 
   - do:
       indices.create:

diff --git a/...apper-extras/src/test/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml b/...apper-extras/src/test/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 7.0.99"
-      reason: "added in 7.1.0"
+      version: " - 7.1.99"
+      reason: "added in 7.2.0"
 
   - do:
       indices.create:

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/sparse-vector/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/sparse-vector/10_basic.yml
@@ -1,8 +1,8 @@
 setup:
   - skip:
       features: headers
-      version: " - 7.0.99"
-      reason: "sparse_vector functions were introduced in 7.1.0"
+      version: " - 7.1.99"
+      reason: "sparse_vector functions were introduced in 7.2.0"
 
   - do:
       indices.create:

diff --git a/...es/mapper-extras/src/test/resources/rest-api-spec/test/sparse-vector/20_special_cases.yml b/...es/mapper-extras/src/test/resources/rest-api-spec/test/sparse-vector/20_special_cases.yml
@@ -1,8 +1,8 @@
 setup:
   - skip:
       features: headers
-      version: " - 7.0.99"
-      reason: "sparse_vector functions were introduced in 7.1.0"
+      version: " - 7.1.99"
+      reason: "sparse_vector functions were introduced in 7.2.0"
 
   - do:
       indices.create:

diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
@@ -988,7 +988,7 @@ public void testClosedIndices() throws Exception {
             closeIndex(index);
         }
 
-        if (getOldClusterVersion().onOrAfter(Version.V_7_1_0)) {
+        if (getOldClusterVersion().onOrAfter(Version.V_7_2_0)) {
             ensureGreenLongWait(index);
             assertClosedIndex(index, true);
         } else {

diff --git a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java
@@ -364,7 +364,7 @@ public void testRecoveryClosedIndex() throws Exception {
         }
 
         final Version indexVersionCreated = indexVersionCreated(indexName);
-        if (indexVersionCreated.onOrAfter(Version.V_7_1_0)) {
+        if (indexVersionCreated.onOrAfter(Version.V_7_2_0)) {
             // index was created on a version that supports the replication of closed indices,
             // so we expect the index to be closed and replicated
             ensureGreen(indexName);
@@ -393,7 +393,7 @@ public void testCloseIndexDuringRollingUpgrade() throws Exception {
             closeIndex(indexName);
         }
 
-        if (minimumNodeVersion.onOrAfter(Version.V_7_1_0)) {
+        if (minimumNodeVersion.onOrAfter(Version.V_7_2_0)) {
             // index is created on a version that supports the replication of closed indices,
             // so we expect the index to be closed and replicated
             ensureGreen(indexName);

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml
@@ -50,10 +50,10 @@
                 )
                 $/
 ---
-"Test cat indices output for closed index (pre 7.1.0)":
+"Test cat indices output for closed index (pre 7.2.0)":
   - skip:
-      version: "7.1.0 - "
-      reason:  "closed indices are replicated starting version 7.1.0"
+      version: "7.2.0 - "
+      reason:  "closed indices are replicated starting version 7.2.0"
 
   - do:
       indices.create:
@@ -93,8 +93,8 @@
 ---
 "Test cat indices output for closed index":
   - skip:
-      version: " - 7.0.99"
-      reason:  "closed indices are replicated starting version 7.1.0"
+      version: " - 7.1.99"
+      reason:  "closed indices are replicated starting version 7.2.0"
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.recovery/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.recovery/10_basic.yml
@@ -79,8 +79,8 @@
 ---
 "Test cat recovery output for closed index":
   - skip:
-      version: " - 7.0.99"
-      reason: closed indices are replicated starting version 7.1.0
+      version: " - 7.1.99"
+      reason: closed indices are replicated starting version 7.2.0
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
@@ -1,8 +1,8 @@
 ---
 "Help":
   - skip:
-      version: " - 7.0.99"
-      reason:  external refresh stats were added in 7.1.0
+      version: " - 7.1.99"
+      reason:  external refresh stats were added in 7.2.0
   - do:
       cat.shards:
         help: true

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml
@@ -50,8 +50,8 @@
 ---
 "Cluster shard allocation explanation test with a closed index":
   - skip:
-      version: " - 7.0.99"
-      reason: closed indices are replicated starting version 7.1.0
+      version: " - 7.1.99"
+      reason: closed indices are replicated starting version 7.2.0
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml
@@ -130,10 +130,10 @@
   - is_true: indices.test_index.shards
 
 ---
-"cluster health with closed index (pre 7.1.0)":
+"cluster health with closed index (pre 7.2.0)":
   - skip:
-      version: "7.1.0 - "
-      reason:  "closed indices are replicated starting version 7.1.0"
+      version: "7.2.0 - "
+      reason:  "closed indices are replicated starting version 7.2.0"
 
   - do:
       indices.create:
@@ -206,8 +206,8 @@
 ---
 "cluster health with closed index":
   - skip:
-      version: " - 7.0.99"
-      reason:  "closed indices are replicated starting version 7.1.0"
+      version: " - 7.1.99"
+      reason:  "closed indices are replicated starting version 7.2.0"
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/30_indices_options.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/30_indices_options.yml
@@ -31,8 +31,8 @@ setup:
 ---
 "cluster health with expand_wildcards":
   - skip:
-      version: " - 7.0.99"
-      reason:  "indices options has been introduced in cluster health request starting version 7.1.0"
+      version: " - 7.1.99"
+      reason:  "indices options has been introduced in cluster health request starting version 7.2.0"
 
   - do:
       cluster.health:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml
@@ -76,8 +76,8 @@
 "get cluster stats returns packaging types":
 
   - skip:
-      version: " - 7.0.99"
-      reason:  "packaging types are added for v7.1.0"
+      version: " - 7.1.99"
+      reason:  "packaging types are added for v7.2.0"
 
   - do:
       cluster.stats: {}

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml
@@ -298,8 +298,8 @@ setup:
 ---
 "Field caps with include_unmapped":
   - skip:
-      version: " - 7.0.99"
-      reason: include_unmapped has been added in 7.1.0
+      version: " - 7.1.99"
+      reason: include_unmapped has been added in 7.2.0
 
   - do:
       field_caps:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml
@@ -54,8 +54,8 @@
 ---
 "Flush parameters validation":
   - skip:
-      version: " - 7.0.99"
-      reason: flush parameters validation is introduced in 7.1.0
+      version: " - 7.1.99"
+      reason: flush parameters validation is introduced in 7.2.0
   - do:
       indices.create:
         index: test

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml
@@ -62,8 +62,8 @@
 ---
 "Close index with wait_for_active_shards set to all":
   - skip:
-      version: " - 7.0.99"
-      reason:  "closed indices are replicated starting version 7.1.0"
+      version: " - 7.1.99"
+      reason:  "closed indices are replicated starting version 7.2.0"
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.recovery/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.recovery/10_basic.yml
@@ -42,8 +42,8 @@
 ---
 "Indices recovery test for closed index":
   - skip:
-      version: " - 7.0.99"
-      reason: closed indices are replicated starting version 7.1.0
+      version: " - 7.1.99"
+      reason: closed indices are replicated starting version 7.2.0
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/30_segments.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/30_segments.yml
@@ -20,7 +20,7 @@ setup:
 "Segment Stats":
 
   - skip:
-      version: " - 7.0.99"
+      version: " - 7.1.99"
       reason: forbid_closed_indices is not supported in ealier version
 
   - do:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
@@ -487,8 +487,8 @@ setup:
 ---
 "Missing source":
   - skip:
-      version: " - 7.0.99"
-      reason:  null/empty sources disallowed in 7.1
+      version: " - 7.1.99"
+      reason:  null/empty sources disallowed in 7.2
 
   - do:
         catch: /Composite \[sources\] cannot be null or empty/
@@ -516,8 +516,8 @@ setup:
 ---
 "Duplicate sources":
   - skip:
-      version: " - 7.0.99"
-      reason:  duplicate names disallowed in 7.1
+      version: " - 7.1.99"
+      reason:  duplicate names disallowed in 7.2
 
   - do:
         catch: /Composite source names must be unique, found duplicates[:] \[keyword\]/

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml
@@ -323,8 +323,8 @@ setup:
 ---
 "Test overlapping":
   - skip:
-      version: " - 7.0.99"
-      reason: "Implemented in 7.1"
+      version: " - 7.1.99"
+      reason: "Implemented in 7.2"
   - do:
       search:
         index: test
@@ -346,8 +346,8 @@ setup:
 ---
 "Test before":
   - skip:
-      version: " - 7.0.99"
-      reason: "Implemented in 7.1"
+      version: " - 7.1.99"
+      reason: "Implemented in 7.2"
   - do:
       search:
         index: test
@@ -366,8 +366,8 @@ setup:
 ---
 "Test after":
   - skip:
-      version: " - 7.0.99"
-      reason: "Implemented in 7.1"
+      version: " - 7.1.99"
+      reason: "Implemented in 7.2"
   - do:
       search:
         index: test

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/250_distance_feature.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/250_distance_feature.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 7.0.99"
-      reason:  "Implemented in 7.1"
+      version: " - 7.1.99"
+      reason:  "Implemented in 7.2"
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/310_match_bool_prefix.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/310_match_bool_prefix.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 7.0.99"
-      reason: "added in 7.1.0"
+      version: " - 7.1.99"
+      reason: "added in 7.2.0"
 
   - do:
       indices.create:

diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -128,12 +128,18 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_6_7_1 = new Version(V_6_7_1_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
     public static final int V_6_7_2_ID = 6070299;
     public static final Version V_6_7_2 = new Version(V_6_7_2_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
+    public static final int V_6_8_0_ID = 6080099;
+    public static final Version V_6_8_0 = new Version(V_6_8_0_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
     public static final int V_7_0_0_ID = 7000099;
     public static final Version V_7_0_0 = new Version(V_7_0_0_ID, org.apache.lucene.util.Version.LUCENE_8_0_0);
     public static final int V_7_0_1_ID = 7000199;
     public static final Version V_7_0_1 = new Version(V_7_0_1_ID, org.apache.lucene.util.Version.LUCENE_8_0_0);
+    public static final int V_7_0_2_ID = 7000299;
+    public static final Version V_7_0_2 = new Version(V_7_0_2_ID, org.apache.lucene.util.Version.LUCENE_8_0_0);
     public static final int V_7_1_0_ID = 7010099;
     public static final Version V_7_1_0 = new Version(V_7_1_0_ID, org.apache.lucene.util.Version.LUCENE_8_0_0);
+    public static final int V_7_2_0_ID = 7020099;
+    public static final Version V_7_2_0 = new Version(V_7_2_0_ID, org.apache.lucene.util.Version.LUCENE_8_0_0);
     public static final int V_8_0_0_ID = 8000099;
     public static final Version V_8_0_0 = new Version(V_8_0_0_ID, org.apache.lucene.util.Version.LUCENE_8_1_0);
     public static final Version CURRENT = V_8_0_0;
@@ -152,12 +158,18 @@ public static Version fromId(int id) {
         switch (id) {
             case V_8_0_0_ID:
                 return V_8_0_0;
+            case V_7_2_0_ID:
+                return V_7_2_0;
             case V_7_1_0_ID:
                 return V_7_1_0;
+            case V_7_0_2_ID:
+                return V_7_0_2;
             case V_7_0_1_ID:
                 return V_7_0_1;
             case V_7_0_0_ID:
                 return V_7_0_0;
+            case V_6_8_0_ID:
+                return V_6_8_0;
             case V_6_7_1_ID:
                 return V_6_7_1;
             case V_6_7_2_ID: