Skip to content

Commit 0de7ccb

Browse files
jasontedorjasontedor
committed
Merge remote-tracking branch 'elastic/ccr' into ccr-stats
* elastic/ccr: (57 commits) ShardFollowNodeTask should fetch operation once (elastic#32455) Do not expose hard-deleted docs in Lucene history (elastic#32333) Tests: Fix convert error tests to use fixed value (elastic#32415) IndicesClusterStateService should replace an init. replica with an init. primary with the same aId (elastic#32374) REST high-level client: parse back _ignored meta field (elastic#32362) [CI] Mute DocumentSubsetReaderTests testSearch Reject follow request if following setting not enabled on follower (elastic#32448) TEST: testDocStats should always use forceMerge (elastic#32450) TEST: avoid merge in testSegmentMemoryTrackedInBreaker TEST: Avoid deletion in FlushIT AwaitsFix IndexShardTests#testDocStats Painless: Add method type to method. (elastic#32441) Remove reference to non-existent store type (elastic#32418) [TEST] Mute failing FlushIT test Fix ordering of bootstrap checks in docs (elastic#32417) [TEST] Mute failing InternalEngineTests#testSeqNoAndCheckpoints Validate source of an index in LuceneChangesSnapshot (elastic#32288) [TEST] Mute failing testConvertLongHexError bump lucene version after backport Upgrade to Lucene-7.5.0-snapshot-608f0277b0 (elastic#32390) ...
2 parents 2ee14e3 + 8cfbb64 commit 0de7ccb

File tree

257 files changed

+2929
-1913
lines changed

Some content is hidden

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

257 files changed

+2929
-1913
lines changed

‎buildSrc/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,12 @@ if (project != rootProject) {
183183
testClass = 'org.elasticsearch.gradle.test.GradleUnitTestCase'
184184
integTestClass = 'org.elasticsearch.gradle.test.GradleIntegrationTestCase'
185185
}
186+
187+
/*
188+
* We alread configure publication and we don't need or want this one that
189+
* comes from the java-gradle-plugin.
190+
*/
191+
afterEvaluate {
192+
generatePomFileForPluginMavenPublication.enabled = false
193+
}
186194
}

‎buildSrc/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 7.0.0-alpha1
2-
lucene = 7.5.0-snapshot-b9e064b935
2+
lucene = 7.5.0-snapshot-608f0277b0
33

44
# optional dependencies
55
spatial4j = 0.7

‎docs/java-rest/high-level/licensing/put-license.asciidoc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ include-tagged::{doc-tests}/LicensingDocumentationIT.java[put-license-response]
3333
--------------------------------------------------
3434
<1> The status of the license
3535
<2> Make sure that the license is valid.
36-
<3> Check the acknowledge flag.
37-
<4> It should be true if license is acknowledge.
38-
<5> Otherwise we can see the acknowledge messages in `acknowledgeHeader()` and check
39-
component-specific messages in `acknowledgeMessages()`.
36+
<3> Check the acknowledge flag. It should be true if license is acknowledged.
37+
<4> Otherwise we can see the acknowledge messages in `acknowledgeHeader()`
38+
<5> and check component-specific messages in `acknowledgeMessages()`.
4039

4140
[[java-rest-high-put-license-async]]
4241
==== Asynchronous Execution

‎docs/painless/painless-contexts.asciidoc‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[[painless-contexts]]
22
== Painless contexts
33

4-
:es_version: https://www.elastic.co/guide/en/elasticsearch/reference/master
5-
:xp_version: https://www.elastic.co/guide/en/x-pack/current
6-
74
A Painless script is evaluated within a context. Each context has values that
85
are available as local variables, a whitelist that controls the available
96
classes, and the methods and fields within those classes (API), and
@@ -18,41 +15,41 @@ specialized code may define new ways to use a Painless script.
1815
| Name | Painless Documentation
1916
| Elasticsearch Documentation
2017
| Update | <<painless-update-context, Painless Documentation>>
21-
| {es_version}/docs-update.html[Elasticsearch Documentation]
18+
| {ref}/docs-update.html[Elasticsearch Documentation]
2219
| Update by query | <<painless-update-by-query-context, Painless Documentation>>
23-
| {es_version}/docs-update-by-query.html[Elasticsearch Documentation]
20+
| {ref}/docs-update-by-query.html[Elasticsearch Documentation]
2421
| Reindex | <<painless-reindex-context, Painless Documentation>>
25-
| {es_version}/docs-reindex.html[Elasticsearch Documentation]
22+
| {ref}/docs-reindex.html[Elasticsearch Documentation]
2623
| Sort | <<painless-sort-context, Painless Documentation>>
27-
| {es_version}/search-request-sort.html[Elasticsearch Documentation]
24+
| {ref}/search-request-sort.html[Elasticsearch Documentation]
2825
| Similarity | <<painless-similarity-context, Painless Documentation>>
29-
| {es_version}/index-modules-similarity.html[Elasticsearch Documentation]
30-
| Weight | <<painless-similarity-context, Painless Documentation>>
31-
| {es_version}/index-modules-similarity.html[Elasticsearch Documentation]
26+
| {ref}/index-modules-similarity.html[Elasticsearch Documentation]
27+
| Weight | <<painless-weight-context, Painless Documentation>>
28+
| {ref}/index-modules-similarity.html[Elasticsearch Documentation]
3229
| Score | <<painless-score-context, Painless Documentation>>
33-
| {es_version}/query-dsl-function-score-query.html[Elasticsearch Documentation]
30+
| {ref}/query-dsl-function-score-query.html[Elasticsearch Documentation]
3431
| Field | <<painless-field-context, Painless Documentation>>
35-
| {es_version}/search-request-script-fields.html[Elasticsearch Documentation]
32+
| {ref}/search-request-script-fields.html[Elasticsearch Documentation]
3633
| Filter | <<painless-filter-context, Painless Documentation>>
37-
| {es_version}/query-dsl-script-query.html[Elasticsearch Documentation]
34+
| {ref}/query-dsl-script-query.html[Elasticsearch Documentation]
3835
| Minimum should match | <<painless-min-should-match-context, Painless Documentation>>
39-
| {es_version}/query-dsl-terms-set-query.html[Elasticsearch Documentation]
36+
| {ref}/query-dsl-terms-set-query.html[Elasticsearch Documentation]
4037
| Metric aggregation initialization | <<painless-metric-agg-init-context, Painless Documentation>>
41-
| {es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
38+
| {ref}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
4239
| Metric aggregation map | <<painless-metric-agg-map-context, Painless Documentation>>
43-
| {es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
40+
| {ref}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
4441
| Metric aggregation combine | <<painless-metric-agg-combine-context, Painless Documentation>>
45-
| {es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
42+
| {ref}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
4643
| Metric aggregation reduce | <<painless-metric-agg-reduce-context, Painless Documentation>>
47-
| {es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
44+
| {ref}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
4845
| Bucket aggregation | <<painless-bucket-agg-context, Painless Documentation>>
49-
| {es_version}/search-aggregations-pipeline-bucket-script-aggregation.html[Elasticsearch Documentation]
46+
| {ref}/search-aggregations-pipeline-bucket-script-aggregation.html[Elasticsearch Documentation]
5047
| Ingest processor | <<painless-ingest-processor-context, Painless Documentation>>
51-
| {es_version}/script-processor.html[Elasticsearch Documentation]
48+
| {ref}/script-processor.html[Elasticsearch Documentation]
5249
| Watcher condition | <<painless-watcher-condition-context, Painless Documentation>>
53-
| {xp_version}/condition-script.html[Elasticsearch Documentation]
50+
| {xpack-ref}/condition-script.html[Elasticsearch Documentation]
5451
| Watcher transform | <<painless-watcher-transform-context, Painless Documentation>>
55-
| {xp_version}/transform-script.html[Elasticsearch Documentation]
52+
| {xpack-ref}/transform-script.html[Elasticsearch Documentation]
5653
|====
5754

5855
include::painless-contexts/index.asciidoc[]

‎docs/painless/painless-contexts/painless-bucket-agg-context.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Bucket aggregation context
33

44
Use a Painless script in an
5-
{es_version}/search-aggregations-pipeline-bucket-script-aggregation.html[bucket aggregation]
5+
{ref}/search-aggregations-pipeline-bucket-script-aggregation.html[bucket aggregation]
66
to calculate a value as a result in a bucket.
77

88
*Variables*

‎docs/painless/painless-contexts/painless-field-context.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Field context
33

44
Use a Painless script to create a
5-
{es_version}/search-request-script-fields.html[script field] to return
5+
{ref}/search-request-script-fields.html[script field] to return
66
a customized value for each document in the results of a query.
77

88
*Variables*
@@ -14,7 +14,7 @@ a customized value for each document in the results of a query.
1414
Contains the fields of the specified document where each field is a
1515
`List` of values.
1616

17-
{es_version}/mapping-source-field.html[`ctx['_source']`] (`Map`)::
17+
{ref}/mapping-source-field.html[`ctx['_source']`] (`Map`)::
1818
Contains extracted JSON in a `Map` and `List` structure for the fields
1919
existing in a stored document.
2020

‎docs/painless/painless-contexts/painless-filter-context.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[painless-filter-context]]
22
=== Filter context
33

4-
Use a Painless script as a {es_version}/query-dsl-script-query.html[filter] in a
4+
Use a Painless script as a {ref}/query-dsl-script-query.html[filter] in a
55
query to include and exclude documents.
66

77

‎docs/painless/painless-contexts/painless-ingest-processor-context.asciidoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[[painless-ingest-processor-context]]
22
=== Ingest processor context
33

4-
Use a Painless script in an {es_version}/script-processor.html[ingest processor]
4+
Use a Painless script in an {ref}/script-processor.html[ingest processor]
55
to modify documents upon insertion.
66

77
*Variables*
88

99
`params` (`Map`, read-only)::
1010
User-defined parameters passed in as part of the query.
1111

12-
{es_version}/mapping-index-field.html[`ctx['_index']`] (`String`)::
12+
{ref}/mapping-index-field.html[`ctx['_index']`] (`String`)::
1313
The name of the index.
1414

15-
{es_version}/mapping-type-field.html[`ctx['_type']`] (`String`)::
15+
{ref}/mapping-type-field.html[`ctx['_type']`] (`String`)::
1616
The type of document within an index.
1717

1818
`ctx` (`Map`)::
@@ -21,10 +21,10 @@ to modify documents upon insertion.
2121

2222
*Side Effects*
2323

24-
{es_version}/mapping-index-field.html[`ctx['_index']`]::
24+
{ref}/mapping-index-field.html[`ctx['_index']`]::
2525
Modify this to change the destination index for the current document.
2626

27-
{es_version}/mapping-type-field.html[`ctx['_type']`]::
27+
{ref}/mapping-type-field.html[`ctx['_type']`]::
2828
Modify this to change the type for the current document.
2929

3030
`ctx` (`Map`, read-only)::

‎docs/painless/painless-contexts/painless-metric-agg-combine-context.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Metric aggregation combine context
33

44
Use a Painless script to
5-
{es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[combine]
5+
{ref}/search-aggregations-metrics-scripted-metric-aggregation.html[combine]
66
values for use in a scripted metric aggregation. A combine script is run once
77
per shard following a <<painless-metric-agg-map-context, map script>> and is
88
optional as part of a full metric aggregation.

‎docs/painless/painless-contexts/painless-metric-agg-init-context.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Metric aggregation initialization context
33

44
Use a Painless script to
5-
{es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[initialize]
5+
{ref}/search-aggregations-metrics-scripted-metric-aggregation.html[initialize]
66
values for use in a scripted metric aggregation. An initialization script is
77
run prior to document collection once per shard and is optional as part of the
88
full metric aggregation.

0 commit comments

Comments
 (0)