Skip to content

Commit 61e6029

Browse files
tlrxtlrx
committed
Merge branch 'master' into feature/searchable-snapshots
2 parents 186d813 + 64e1a77 commit 61e6029

File tree

99 files changed

+1155
-281
lines changed

Some content is hidden

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

99 files changed

+1155
-281
lines changed

‎buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 8.0.0
2-
lucene = 8.4.0-snapshot-e648d601efb
2+
lucene = 8.4.0-snapshot-662c455
33

44
bundled_jdk_vendor = adoptopenjdk
55
bundled_jdk = 13.0.1+9

‎docs/reference/cat/shards.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Reason the shard is unassigned. Returned values are:
257257
* `NEW_INDEX_RESTORED`: Unassigned as a result of restoring into a new index.
258258
* `NODE_LEFT`: Unassigned as a result of the node hosting it leaving the cluster.
259259
* `REALLOCATED_REPLICA`: A better replica location is identified and causes the existing replica allocation to be cancelled.
260-
* `REINITIALIZED`: When a shard moves from started back to initializing, for example, with shadow replicas.
260+
* `REINITIALIZED`: When a shard moves from started back to initializing.
261261
* `REPLICA_ADDED`: Unassigned as a result of explicit addition of a replica.
262262
* `REROUTE_CANCELLED`: Unassigned as a result of explicit cancel reroute command.
263263

‎docs/reference/ingest/ingest-node.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,7 @@ include::processors/append.asciidoc[]
825825
include::processors/bytes.asciidoc[]
826826
include::processors/circle.asciidoc[]
827827
include::processors/convert.asciidoc[]
828+
include::processors/csv.asciidoc[]
828829
include::processors/date.asciidoc[]
829830
include::processors/date-index-name.asciidoc[]
830831
include::processors/dissect.asciidoc[]

‎docs/reference/ingest/processors/csv.asciidoc

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[[csv-processor]]
2+
=== CSV Processor
3+
Extracts fields from CSV line out of a single text field within a document. Any empty field in CSV will be skipped.
4+
5+
[[csv-options]]
6+
.CSV Options
7+
[options="header"]
8+
|======
9+
| Name | Required | Default | Description
10+
| `field` | yes | - | The field to extract data from
11+
| `target_fields` | yes | - | The array of fields to assign extracted values to
12+
| `separator` | no | , | Separator used in CSV, has to be single character string
13+
| `quote` | no | " | Quote used in CSV, has to be single character string
14+
| `ignore_missing` | no | `true` | If `true` and `field` does not exist, the processor quietly exits without modifying the document
15+
| `trim` | no | `false` | Trim whitespaces in unquoted fields
16+
include::common-options.asciidoc[]
17+
|======
18+
19+
[source,js]
20+
--------------------------------------------------
21+
{
22+
"csv": {
23+
"field": "my_field",
24+
"target_fields": ["field1, field2"],
25+
}
26+
}
27+
--------------------------------------------------
28+
// NOTCONSOLE
29+
30+
If the `trim` option is enabled then any whitespace in the beginning and in the end of each unquoted field will be trimmed.
31+
For example with configuration above, a value of `A, B` will result in field `field2`
32+
having value `{nbsp}B` (with space at the beginning). If `trim` is enabled `A, B` will result in field `field2`
33+
having value `B` (no whitespace). Quoted fields will be left untouched.

‎docs/reference/mapping/params/normalizer.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,20 @@ both index and query time.
9090
"value": 2,
9191
"relation": "eq"
9292
},
93-
"max_score": 0.47000363,
93+
"max_score": 0.4700036,
9494
"hits": [
9595
{
9696
"_index": "index",
9797
"_id": "1",
98-
"_score": 0.47000363,
98+
"_score": 0.4700036,
9999
"_source": {
100100
"foo": "BÀR"
101101
}
102102
},
103103
{
104104
"_index": "index",
105105
"_id": "2",
106-
"_score": 0.47000363,
106+
"_score": 0.4700036,
107107
"_source": {
108108
"foo": "bar"
109109
}

‎docs/reference/modules/indices/query_cache.asciidoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ the cluster:
1818
either a percentage value, like `5%`, or an exact value, like `512mb`.
1919

2020
The following setting is an _index_ setting that can be configured on a
21-
per-index basis:
21+
per-index basis. Can only be set at index creation time or on a
22+
<<indices-open-close,closed index>>:
2223

2324
`index.queries.cache.enabled`::
2425

‎docs/reference/query-dsl/function-score-query.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ GET /_search
415415

416416
`offset`::
417417
If an `offset` is defined, the decay function will only compute the
418-
decay function for documents with a distance greater that the defined
418+
decay function for documents with a distance greater than the defined
419419
`offset`. The default is 0.
420420

421421
`decay`::

‎docs/reference/search/explain.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ The API returns the following response:
106106
"_id":"0",
107107
"matched":true,
108108
"explanation":{
109-
"value":1.6943597,
109+
"value":1.6943598,
110110
"description":"weight(message:elasticsearch in 0) [PerFieldSimilarity], result of:",
111111
"details":[
112112
{
113-
"value":1.6943597,
114-
"description":"score(freq=1.0), product of:",
113+
"value":1.6943598,
114+
"description":"score(freq=1.0), computed as boost * idf * tf from:",
115115
"details":[
116116
{
117117
"value":2.2,
@@ -135,7 +135,7 @@ The API returns the following response:
135135
]
136136
},
137137
{
138-
"value":0.5555555,
138+
"value":0.5555556,
139139
"description":"tf, computed as freq / (freq + k1 * (1 - b + b * dl / avgdl)) from:",
140140
"details":[
141141
{

‎docs/reference/search/request-body.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ The API returns the following response:
118118
"value": 1,
119119
"relation": "eq"
120120
},
121-
"max_score": 1.3862944,
121+
"max_score": 1.3862942,
122122
"hits" : [
123123
{
124124
"_index" : "twitter",
125125
"_id" : "0",
126-
"_score": 1.3862944,
126+
"_score": 1.3862942,
127127
"_source" : {
128128
"user" : "kimchy",
129129
"message": "trying out Elasticsearch",

‎docs/reference/search/request/highlighting.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -840,12 +840,12 @@ Response:
840840
"value": 1,
841841
"relation": "eq"
842842
},
843-
"max_score": 1.601195,
843+
"max_score": 1.6011951,
844844
"hits": [
845845
{
846846
"_index": "twitter",
847847
"_id": "1",
848-
"_score": 1.601195,
848+
"_score": 1.6011951,
849849
"_source": {
850850
"user": "test",
851851
"message": "some message with the number 1",
@@ -897,12 +897,12 @@ Response:
897897
"value": 1,
898898
"relation": "eq"
899899
},
900-
"max_score": 1.601195,
900+
"max_score": 1.6011951,
901901
"hits": [
902902
{
903903
"_index": "twitter",
904904
"_id": "1",
905-
"_score": 1.601195,
905+
"_score": 1.6011951,
906906
"_source": {
907907
"user": "test",
908908
"message": "some message with the number 1",

‎docs/reference/search/request/inner-hits.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,12 +379,12 @@ Which would look like:
379379
"value": 1,
380380
"relation": "eq"
381381
},
382-
"max_score": 0.6931472,
382+
"max_score": 0.6931471,
383383
"hits": [
384384
{
385385
"_index": "test",
386386
"_id": "1",
387-
"_score": 0.6931472,
387+
"_score": 0.6931471,
388388
"_source": ...,
389389
"inner_hits": {
390390
"comments.votes": { <1>
@@ -393,7 +393,7 @@ Which would look like:
393393
"value": 1,
394394
"relation": "eq"
395395
},
396-
"max_score": 0.6931472,
396+
"max_score": 0.6931471,
397397
"hits": [
398398
{
399399
"_index": "test",
@@ -406,7 +406,7 @@ Which would look like:
406406
"offset": 0
407407
}
408408
},
409-
"_score": 0.6931472,
409+
"_score": 0.6931471,
410410
"_source": {
411411
"value": 1,
412412
"voter": "kimchy"

‎docs/reference/search/search.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,12 +360,12 @@ The API returns the following response:
360360
"value" : 1,
361361
"relation" : "eq"
362362
},
363-
"max_score" : 1.3862944,
363+
"max_score" : 1.3862942,
364364
"hits" : [
365365
{
366366
"_index" : "twitter",
367367
"_id" : "0",
368-
"_score" : 1.3862944,
368+
"_score" : 1.3862942,
369369
"_source" : {
370370
"date" : "2009-11-15T14:12:12",
371371
"likes" : 0,

‎docs/reference/search/uri-request.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ The API returns the following response:
134134
"value": 1,
135135
"relation": "eq"
136136
},
137-
"max_score": 1.3862944,
137+
"max_score": 1.3862942,
138138
"hits" : [
139139
{
140140
"_index" : "twitter",
141141
"_id" : "0",
142-
"_score": 1.3862944,
142+
"_score": 1.3862942,
143143
"_source" : {
144144
"user" : "kimchy",
145145
"date" : "2009-11-15T14:12:12",

‎docs/reference/settings/security-settings.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ namespace in `elasticsearch.yml`. For example:
188188
----------------------------------------
189189
xpack.security.authc.realms:
190190
191-
native.realm1:
191+
native.realm1: <1>
192192
order: 0
193193
...
194194
@@ -201,6 +201,9 @@ xpack.security.authc.realms:
201201
...
202202
...
203203
----------------------------------------
204+
<1> Specifies the type of realm (for example, `native`, `ldap`,
205+
`active_directory`, `pki`, `file`, `kerberos`, `saml`) and the realm name. This
206+
information is required.
204207

205208
The valid settings vary depending on the realm type. For more
206209
information, see <<setting-up-authentication>>.
@@ -209,9 +212,6 @@ information, see <<setting-up-authentication>>.
209212
[[ref-realm-settings]]
210213
===== Settings valid for all realms
211214

212-
`type`::
213-
The type of the realm: `native`, `ldap`, `active_directory`, `pki`, or `file`. Required.
214-
215215
`order`::
216216
The priority of the realm within the realm chain. Realms with a lower order are
217217
consulted first. Although not required, use of this setting is strongly

0 commit comments

Comments
 (0)