#26496: handle shard_size correctly in the completion suggester and…

… tests. The completion suggester has a `shard_size` option that sets the size of the suggestions to retrieve per shard but it is ignored by the builder. This commit restores the handling of this option and fixes a test that can randomly fail without it.
elastic · Sep 7, 2017 · e684c5e · e684c5e
1 parent cff904b
commit e684c5e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java
@@ -58,8 +58,8 @@ protected Suggest.Suggestion<? extends Suggest.Suggestion.Entry<? extends Sugges
             CompletionSuggestion.Entry completionSuggestEntry = new CompletionSuggestion.Entry(
                 new Text(spare.toString()), 0, spare.length());
             completionSuggestion.addTerm(completionSuggestEntry);
-            TopSuggestDocsCollector collector =
-                new TopDocumentsCollector(suggestionContext.getSize(), suggestionContext.isSkipDuplicates());
+            int shardSize = suggestionContext.getShardSize() != null ? suggestionContext.getShardSize() : suggestionContext.getSize();
+            TopSuggestDocsCollector collector = new TopDocumentsCollector(shardSize, suggestionContext.isSkipDuplicates());
             suggest(searcher, suggestionContext.toQuery(), collector);
             int numResult = 0;
             for (TopSuggestDocs.SuggestScoreDoc suggestScoreDoc : collector.get().scoreLookupDocs()) {

diff --git a/...rc/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java b/...rc/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java
@@ -289,6 +289,9 @@ public SuggestionContext build(QueryShardContext context) throws IOException {
         suggestionContext.setSkipDuplicates(skipDuplicates);
         suggestionContext.setFuzzyOptions(fuzzyOptions);
         suggestionContext.setRegexOptions(regexOptions);
+        if (shardSize != null) {
+            suggestionContext.setShardSize(shardSize);
+        }
         MappedFieldType mappedFieldType = mapperService.fullName(suggestionContext.getField());
         if (mappedFieldType == null || mappedFieldType instanceof CompletionFieldMapper.CompletionFieldType == false) {
             throw new IllegalArgumentException("Field [" + suggestionContext.getField() + "] is not a completion suggest field");

diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java
@@ -1157,7 +1157,7 @@ public void testMultiDocSuggestions() throws Exception {
                 ));
         }
         indexRandom(true, indexRequestBuilders);
-        CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD).prefix("sugg");
+        CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD).prefix("sugg").shardSize(15);
         assertSuggestions("foo", prefix, "suggester10", "suggester9", "suggester8", "suggester7", "suggester6");
     }