Skip to content

Commit 3788429

Browse files
committed
Add some docs
1 parent b6ebe31 commit 3788429

File tree

12 files changed

+26
-13
lines changed

12 files changed

+26
-13
lines changed

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/TransportNoopSearchAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
package org.elasticsearch.plugin.noop.action.search;
1010

1111
import org.elasticsearch.action.ActionListener;
12+
import org.elasticsearch.action.search.PhaseFailure;
1213
import org.elasticsearch.action.search.SearchRequest;
1314
import org.elasticsearch.action.search.SearchResponse;
1415
import org.elasticsearch.action.search.ShardSearchFailure;
15-
import org.elasticsearch.action.search.PhaseFailure;
1616
import org.elasticsearch.action.support.ActionFilters;
1717
import org.elasticsearch.action.support.HandledTransportAction;
1818
import org.elasticsearch.common.util.concurrent.EsExecutors;

docs/reference/search/retriever.asciidoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,14 @@ Note that score calculations vary depending on the model used.
610610
Applies the specified <<query-dsl-bool-query, boolean query filter>> to the child <<retriever, retriever>>.
611611
If the child retriever already specifies any filters, then this top-level filter is applied in conjuction with the filter defined in the child retriever.
612612

613+
`allow_rerank_failures`::
614+
(Optional, `boolean`)
615+
+
616+
If `true`, a failure during reranking will not fail the whole query. Instead, the documents
617+
from the preceding steps are passed-through unmodified to subsequent retriever steps.
618+
The failure exception will be available in the <<search-api-phase-failures, `phase_failures`>> field of the search response.
619+
Defaults to `false`.
620+
613621
[discrete]
614622
[[text-similarity-reranker-retriever-example-elastic-rerank]]
615623
==== Example: Elastic Rerank

docs/reference/search/search.asciidoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,14 @@ Took time does *not* include:
782782
If `true`,
783783
the request timed out before completion;
784784
returned results may be partial or empty.
785+
--
786+
787+
[[search-api-phase-failures]]
788+
`phase_failures`::
789+
(object)
790+
If present, contains information on any failures in specific search phases
791+
that did not prevent some results from being returned.
792+
In such cases, search results may be different to those expected.
785793

786794
[[search-api-shards]]
787795
`_shards`::

modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/SearchTemplateResponseTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
package org.elasticsearch.script.mustache;
1111

1212
import org.apache.lucene.search.TotalHits;
13+
import org.elasticsearch.action.search.PhaseFailure;
1314
import org.elasticsearch.action.search.SearchResponse;
1415
import org.elasticsearch.action.search.ShardSearchFailure;
15-
import org.elasticsearch.action.search.PhaseFailure;
1616
import org.elasticsearch.common.bytes.BytesReference;
1717
import org.elasticsearch.common.xcontent.XContentHelper;
1818
import org.elasticsearch.search.SearchHit;

server/src/main/java/org/elasticsearch/action/search/SearchResponse.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,7 @@ public SearchResponse(StreamInput in) throws IOException {
106106
s -> s == 0 ? ShardSearchFailure.EMPTY_ARRAY : new ShardSearchFailure[s]
107107
);
108108
if (in.getTransportVersion().onOrAfter(TransportVersions.SEARCH_SUBSIDIARY_FAILURES)) {
109-
phaseFailures = in.readArray(
110-
PhaseFailure::new,
111-
s -> s == 0 ? PhaseFailure.EMPTY_ARRAY : new PhaseFailure[s]
112-
);
109+
phaseFailures = in.readArray(PhaseFailure::new, s -> s == 0 ? PhaseFailure.EMPTY_ARRAY : new PhaseFailure[s]);
113110
} else {
114111
phaseFailures = PhaseFailure.EMPTY_ARRAY;
115112
}

server/src/test/java/org/elasticsearch/action/search/SearchResponseMergerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void testMergePhaseFailures() throws InterruptedException {
170170
0,
171171
100L,
172172
ShardSearchFailure.EMPTY_ARRAY,
173-
phaseFailures,
173+
phaseFailures,
174174
SearchResponse.Clusters.EMPTY
175175
);
176176
try {

test/framework/src/main/java/org/elasticsearch/search/SearchResponseUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
import org.apache.lucene.util.SetOnce;
1414
import org.elasticsearch.ElasticsearchException;
1515
import org.elasticsearch.action.search.MultiSearchResponse;
16+
import org.elasticsearch.action.search.PhaseFailure;
1617
import org.elasticsearch.action.search.SearchRequestBuilder;
1718
import org.elasticsearch.action.search.SearchResponse;
1819
import org.elasticsearch.action.search.SearchResponse.Clusters;
1920
import org.elasticsearch.action.search.ShardSearchFailure;
20-
import org.elasticsearch.action.search.PhaseFailure;
2121
import org.elasticsearch.client.Response;
2222
import org.elasticsearch.cluster.metadata.IndexMetadata;
2323
import org.elasticsearch.common.ParsingException;

x-pack/plugin/async-search/src/main/java/org/elasticsearch/xpack/search/MutableSearchResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import org.apache.lucene.search.TotalHits;
1010
import org.elasticsearch.ElasticsearchException;
1111
import org.elasticsearch.ExceptionsHelper;
12+
import org.elasticsearch.action.search.PhaseFailure;
1213
import org.elasticsearch.action.search.SearchResponse;
1314
import org.elasticsearch.action.search.SearchResponse.Clusters;
1415
import org.elasticsearch.action.search.SearchResponseMerger;
1516
import org.elasticsearch.action.search.ShardSearchFailure;
16-
import org.elasticsearch.action.search.PhaseFailure;
1717
import org.elasticsearch.common.Strings;
1818
import org.elasticsearch.common.lucene.Lucene;
1919
import org.elasticsearch.common.util.concurrent.AtomicArray;

x-pack/plugin/async-search/src/test/java/org/elasticsearch/xpack/search/AsyncSearchResponseTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import org.apache.lucene.index.CorruptIndexException;
1111
import org.elasticsearch.TransportVersion;
1212
import org.elasticsearch.action.OriginalIndices;
13+
import org.elasticsearch.action.search.PhaseFailure;
1314
import org.elasticsearch.action.search.SearchResponse;
1415
import org.elasticsearch.action.search.ShardSearchFailure;
15-
import org.elasticsearch.action.search.PhaseFailure;
1616
import org.elasticsearch.action.support.IndicesOptions;
1717
import org.elasticsearch.common.Strings;
1818
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import org.elasticsearch.action.ValidateActions;
1818
import org.elasticsearch.action.search.MultiSearchRequest;
1919
import org.elasticsearch.action.search.MultiSearchResponse;
20+
import org.elasticsearch.action.search.PhaseFailure;
2021
import org.elasticsearch.action.search.SearchRequest;
2122
import org.elasticsearch.action.search.SearchResponse;
2223
import org.elasticsearch.action.search.ShardSearchFailure;
23-
import org.elasticsearch.action.search.PhaseFailure;
2424
import org.elasticsearch.action.support.ActionFilters;
2525
import org.elasticsearch.action.support.single.shard.SingleShardRequest;
2626
import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;

0 commit comments

Comments
 (0)