Skip to content

Commit f686a0b

Browse files
committed
Merge remote-tracking branch 'elastic/master' into geoshape-doc-values
2 parents 9d5fa9f + 11ef3c8 commit f686a0b

File tree

166 files changed

+4814
-1176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+4814
-1176
lines changed

docs/reference/aggregations/metrics/geocentroid-aggregation.asciidoc

+14
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,17 @@ The response for the above aggregation:
143143
}
144144
--------------------------------------------------
145145
// TESTRESPONSE[s/\.\.\./"took": $body.took,"_shards": $body._shards,"hits":$body.hits,"timed_out":false,/]
146+
147+
[WARNING]
148+
.Using `geo_centroid` as a sub-aggregation of `geohash_grid`
149+
====
150+
The <<search-aggregations-bucket-geohashgrid-aggregation,`geohash_grid`>>
151+
aggregation places documents, not individual geo-points, into buckets. If a
152+
document's `geo_point` field contains <<array,multiple values>>, the document
153+
could be assigned to multiple buckets, even if one or more of its geo-points are
154+
outside the bucket boundaries.
155+
156+
If a `geocentroid` sub-aggregation is also used, each centroid is calculated
157+
using all geo-points in a bucket, including those outside the bucket boundaries.
158+
This can result in centroids outside of bucket boundaries.
159+
====

docs/reference/cat/nodes.asciidoc

-12
Original file line numberDiff line numberDiff line change
@@ -285,18 +285,6 @@ Number of suggest operations, such as `0`.
285285

286286
include::{docdir}/rest-api/common-parms.asciidoc[tag=help]
287287

288-
include::{docdir}/rest-api/common-parms.asciidoc[tag=local]
289-
+
290-
--
291-
`local`::
292-
(Optional, boolean) If `true`, the request computes the list of selected nodes
293-
from the local cluster state. Defaults to `false`, which means the list of
294-
selected nodes is computed from the cluster state on the master node. In either
295-
case the coordinating node sends a request for further information to each
296-
selected node. deprecated::[8.0,This parameter does not cause this API to act
297-
locally. It will be removed in version 8.0.]
298-
--
299-
300288
include::{docdir}/rest-api/common-parms.asciidoc[tag=master-timeout]
301289

302290
include::{docdir}/rest-api/common-parms.asciidoc[tag=cat-s]

docs/reference/index-docinfo.xml

-13
This file was deleted.

docs/reference/index-modules/history-retention.asciidoc

+3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ there>>. {ccr-cap} will not function if soft deletes are disabled.
6565
configured at index creation and only on indices created on or after 6.5.0.
6666
The default value is `true`.
6767

68+
deprecated::[7.6, Creating indices with soft-deletes disabled is
69+
deprecated and will be removed in future Elasticsearch versions.]
70+
6871
`index.soft_deletes.retention_lease.period`::
6972

7073
The maximum length of time to retain a shard history retention lease before

docs/reference/index.x-docinfo.xml

-13
This file was deleted.

docs/reference/migration/migrate_8_0.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ coming[8.0.0]
3030
* <<breaking_80_search_changes>>
3131
* <<breaking_80_settings_changes>>
3232
* <<breaking_80_indices_changes>>
33+
* <<breaking_80_api_changes>>
3334

3435
//NOTE: The notable-breaking-changes tagged regions are re-used in the
3536
//Installation and Upgrade Guide
@@ -81,3 +82,4 @@ include::migrate_8_0/reindex.asciidoc[]
8182
include::migrate_8_0/search.asciidoc[]
8283
include::migrate_8_0/settings.asciidoc[]
8384
include::migrate_8_0/indices.asciidoc[]
85+
include::migrate_8_0/api.asciidoc[]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[float]
2+
[[breaking_80_api_changes]]
3+
=== REST API changes
4+
5+
//NOTE: The notable-breaking-changes tagged regions are re-used in the
6+
//Installation and Upgrade Guide
7+
//tag::notable-breaking-changes[]
8+
9+
// end::notable-breaking-changes[]
10+
11+
[float]
12+
==== Deprecated `?local` parameter removed from `GET _cat/nodes` API
13+
14+
The `?local` parameter to the `GET _cat/nodes` API was deprecated in 7.x and is
15+
rejected in 8.0. This parameter caused the API to use the local cluster state
16+
to determine the nodes returned by the API rather than the cluster state from
17+
the master, but this API requests information from each selected node
18+
regardless of the `?local` parameter which means this API does not run in a
19+
fully node-local fashion.

docs/reference/redirects.asciidoc

-223
Original file line numberDiff line numberDiff line change
@@ -26,229 +26,6 @@ index that make warmers not necessary anymore.
2626
The types exists endpoint has been removed. See <<removal-of-types>> for
2727
more details.
2828

29-
[role="exclude",id="xpack-api"]
30-
=== X-Pack APIs
31-
32-
{es} {xpack} APIs are now documented in <<rest-apis, REST APIs>>.
33-
34-
[role="exclude",id="ml-calendar-resource"]]
35-
=== Calendar resources
36-
37-
See <<ml-get-calendar>> and
38-
{ml-docs}/ml-calendars.html[Calendars and scheduled events].
39-
40-
[role="exclude",id="ml-filter-resource"]
41-
=== Filter resources
42-
43-
See <<ml-get-filter>> and
44-
{ml-docs}/ml-rules.html[Machine learning custom rules].
45-
46-
[role="exclude",id="ml-event-resource"]
47-
=== Scheduled event resources
48-
49-
See <<ml-get-calendar-event>> and
50-
{ml-docs}/ml-calendars.html[Calendars and scheduled events].
51-
52-
[role="exclude",id="index-apis"]
53-
=== Index APIs
54-
{es} index APIs are now documented in <<indices>>.
55-
56-
[role="exclude",id="search-request-docvalue-fields"]
57-
=== Doc value fields parameter for request body search API
58-
See <<request-body-search-docvalue-fields>>.
59-
60-
[role="exclude",id="search-request-explain"]
61-
=== Explain parameter for request body search API
62-
See <<request-body-search-explain>>.
63-
64-
[role="exclude",id="search-request-collapse"]
65-
=== Collapse parameter for request body search API
66-
See <<request-body-search-collapse>>.
67-
68-
[role="exclude",id="search-request-from-size"]
69-
=== From and size parameters for request body search API
70-
See <<request-body-search-from-size>>.
71-
72-
[role="exclude",id="search-request-highlighting"]
73-
=== Highlight parameter for request body search API
74-
See <<request-body-search-highlighting>>.
75-
76-
[role="exclude",id="search-request-index-boost"]
77-
=== Index boost parameter for request body search API
78-
See <<request-body-search-index-boost>>.
79-
80-
[role="exclude",id="search-request-inner-hits"]
81-
=== Inner hits parameter for request body search API
82-
See <<request-body-search-inner-hits>>.
83-
84-
[role="exclude",id="search-request-min-score"]
85-
=== Minimum score parameter for request body search API
86-
See <<request-body-search-min-score>>.
87-
88-
[role="exclude",id="search-request-named-queries-and-filters"]
89-
=== Named query parameter for request body search API
90-
See <<request-body-search-queries-and-filters>>.
91-
92-
[role="exclude",id="search-request-post-filter"]
93-
=== Post filter parameter for request body search API
94-
See <<request-body-search-post-filter>>.
95-
96-
[role="exclude",id="search-request-preference"]
97-
=== Preference parameter for request body search API
98-
See <<request-body-search-preference>>.
99-
100-
[role="exclude",id="search-request-query"]
101-
=== Query parameter for request body search API
102-
See <<request-body-search-query>>.
103-
104-
[role="exclude",id="search-request-rescore"]
105-
=== Rescoring parameter for request body search API
106-
See <<request-body-search-rescore>>.
107-
108-
[role="exclude",id="search-request-script-fields"]
109-
=== Script fields parameter for request body search API
110-
See <<request-body-search-script-fields>>.
111-
112-
[role="exclude",id="search-request-scroll"]
113-
=== Scroll parameter for request body search API
114-
See <<request-body-search-scroll>>.
115-
116-
[role="exclude",id="search-request-search-after"]
117-
=== Search after parameter for request body search API
118-
See <<request-body-search-search-after>>.
119-
120-
[role="exclude",id="search-request-search-type"]
121-
=== Search type parameter for request body search API
122-
See <<request-body-search-search-type>>.
123-
124-
[role="exclude",id="search-request-seq-no-primary-term"]
125-
=== Sequence numbers and primary terms parameter for request body search API
126-
See <<request-body-search-search-type>>.
127-
128-
[role="exclude",id="search-request-sort"]
129-
=== Sort parameter for request body search API
130-
See <<request-body-search-sort>>.
131-
132-
[role="exclude",id="search-request-source-filtering"]
133-
=== Source filtering parameter for request body search API
134-
See <<request-body-search-source-filtering>>.
135-
136-
[role="exclude",id="search-request-stored-fields"]
137-
=== Stored fields parameter for request body search API
138-
See <<request-body-search-stored-fields>>.
139-
140-
[role="exclude",id="search-request-track-total-hits"]
141-
=== Track total hits parameter for request body search API
142-
See <<request-body-search-track-total-hits>>.
143-
144-
[role="exclude",id="search-request-version"]
145-
=== Version parameter for request body search API
146-
See <<request-body-search-version>>.
147-
148-
[role="exclude",id="search-suggesters-term"]
149-
=== Term suggester
150-
See <<term-suggester>>.
151-
152-
[role="exclude",id="search-suggesters-phrase"]
153-
=== Phrase suggester
154-
See <<phrase-suggester>>.
155-
156-
[role="exclude",id="search-suggesters-completion"]
157-
=== Completion suggester
158-
See <<completion-suggester>>.
159-
160-
[role="exclude",id="suggester-context"]
161-
=== Context suggester
162-
See <<context-suggester>>.
163-
164-
[role="exclude",id="returning-suggesters-type"]
165-
=== Return suggester type
166-
See <<return-suggesters-type>>.
167-
168-
[role="exclude",id="search-profile-queries"]
169-
=== Profiling queries
170-
See <<profiling-queries>>.
171-
172-
[role="exclude",id="search-profile-aggregations"]
173-
=== Profiling aggregations
174-
See <<profiling-aggregations>>.
175-
176-
[role="exclude",id="search-profile-considerations"]
177-
=== Profiling considerations
178-
See <<profiling-considerations>>.
179-
180-
[role="exclude",id="_explain_analyze"]
181-
=== Explain analyze API
182-
See <<explain-analyze-api>>.
183-
184-
[role="exclude",id="indices-synced-flush"]
185-
=== Synced flush API
186-
See <<indices-synced-flush-api>>.
187-
188-
[role="exclude",id="_repositories"]
189-
=== Snapshot repositories
190-
See <<snapshots-repositories>>.
191-
192-
[role="exclude",id="_snapshot"]
193-
=== Snapshot
194-
See <<snapshots-take-snapshot>>.
195-
196-
[role="exclude",id="getting-started-explore"]
197-
=== Exploring your cluster
198-
See <<cat>>.
199-
200-
[role="exclude",id="getting-started-cluster-health"]
201-
=== Cluster health
202-
See <<cat-health>>.
203-
204-
[role="exclude", id="getting-started-list-indices"]
205-
=== List all indices
206-
See <<cat-indices>>.
207-
208-
[role="exclude", id="getting-started-create-index"]
209-
=== Create an index
210-
See <<indices-create-index>>.
211-
212-
[role="exclude", id="getting-started-query-document"]
213-
=== Index and query a document
214-
See <<getting-started-index>>.
215-
216-
[role="exclude", id="getting-started-delete-index"]
217-
=== Delete an index
218-
See <<indices-delete-index>>.
219-
220-
[role="exclude", id="getting-started-modify-data"]
221-
== Modifying your data
222-
See <<docs-update>>.
223-
224-
[role="exclude", id="indexing-replacing-documents"]
225-
=== Indexing/replacing documents
226-
See <<docs-index_>>.
227-
228-
[role="exclude", id="getting-started-explore-data"]
229-
=== Exploring your data
230-
See <<getting-started-search>>.
231-
232-
[role="exclude", id="getting-started-search-API"]
233-
=== Search API
234-
See <<getting-started-search>>.
235-
236-
[role="exclude", id="getting-started-conclusion"]
237-
=== Conclusion
238-
See <<getting-started-next-steps>>.
239-
240-
[role="exclude",id="ccs-reduction"]
241-
=== {ccs-cap} reduction
242-
See <<ccs-works>>.
243-
244-
[role="exclude",id="administer-elasticsearch"]
245-
=== Administering {es}
246-
See <<high-availability>>.
247-
248-
[role="exclude",id="slm-api"]
249-
=== Snapshot lifecycle management API
250-
See <<snapshot-lifecycle-management-api>>.
251-
25229
[role="exclude",id="delete-data-frame-transform"]
25330
=== Delete {transforms} API
25431

libs/geo/src/test/java/org/elasticsearch/geometry/BaseGeometryTestCase.java

-7
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.elasticsearch.ElasticsearchException;
2323
import org.elasticsearch.Version;
24-
import org.elasticsearch.common.io.stream.Writeable;
2524
import org.elasticsearch.geometry.utils.GeographyValidator;
2625
import org.elasticsearch.geometry.utils.WellKnownText;
2726
import org.elasticsearch.test.AbstractWireTestCase;
@@ -42,12 +41,6 @@ protected final T createTestInstance() {
4241

4342
protected abstract T createTestInstance(boolean hasAlt);
4443

45-
@Override
46-
protected Writeable.Reader<T> instanceReader() {
47-
throw new IllegalStateException("shouldn't be called in this test");
48-
}
49-
50-
5144
@SuppressWarnings("unchecked")
5245
@Override
5346
protected T copyInstance(T instance, Version version) throws IOException {

plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2SeedHostsProvider.java

+2-11
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import static org.elasticsearch.discovery.ec2.AwsEc2Service.HostType.TAG_PREFIX;
5454

5555
class AwsEc2SeedHostsProvider implements SeedHostsProvider {
56-
56+
5757
private static final Logger logger = LogManager.getLogger(AwsEc2SeedHostsProvider.class);
5858

5959
private final TransportService transportService;
@@ -221,22 +221,13 @@ private DescribeInstancesRequest buildDescribeInstancesRequest() {
221221

222222
private final class TransportAddressesCache extends SingleObjectCache<List<TransportAddress>> {
223223

224-
private boolean empty = true;
225-
226224
protected TransportAddressesCache(TimeValue refreshInterval) {
227225
super(refreshInterval, new ArrayList<>());
228226
}
229227

230-
@Override
231-
protected boolean needsRefresh() {
232-
return (empty || super.needsRefresh());
233-
}
234-
235228
@Override
236229
protected List<TransportAddress> refresh() {
237-
final List<TransportAddress> nodes = fetchDynamicNodes();
238-
empty = nodes.isEmpty();
239-
return nodes;
230+
return fetchDynamicNodes();
240231
}
241232
}
242233
}

0 commit comments

Comments
 (0)