honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Search: When all shards fail on second / third phase, make sure to return a response with proper shard failures, closes #1033.

This commit is contained in:
kimchy 2011-06-15 15:28:31 +03:00
parent b7d492af4b
commit bbd73d5afa
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
View File

@ -20,7 +20,11 @@
package org.elasticsearch.search.controller;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.ShardFieldDocSortedHitQueue;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TopFieldDocs;
import org.apache.lucene.util.PriorityQueue;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.collect.Iterables;
@ -256,7 +260,13 @@ public class SearchPhaseController extends AbstractComponent {
boolean sorted = false;
int sortScoreIndex = -1;
QuerySearchResult querySearchResult = Iterables.get(queryResults.values(), 0).queryResult();
QuerySearchResult querySearchResult;
try {
querySearchResult = Iterables.get(queryResults.values(), 0).queryResult();
} catch (IndexOutOfBoundsException e) {
// no results, return an empty response
return InternalSearchResponse.EMPTY;
}
if (querySearchResult.topDocs() instanceof TopFieldDocs) {
sorted = true;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java
View File

@ -43,6 +43,8 @@ public class InternalSearchResponse implements Streamable, ToXContent {
private boolean timedOut;
public static final InternalSearchResponse EMPTY = new InternalSearchResponse(new InternalSearchHits(new InternalSearchHit[0], 0, 0), null, false);
private InternalSearchResponse() {
}