Resolve index names in indices_boost

This change allows specifying alias/wildcard expression in indices_boost.
And added another format for specifying indices_boost. It accepts array of index name and boost pair.
If an index is included in multiple aliases/wildcard expressions, the first match will be used.
With new format, old format is marked as deprecated.

Closes #4756

1 files changed, 5 insertions, 3 deletions

diff --git a/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java
index 2db44c9d0b..13751ae453 100644
--- a/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java
@@ -185,7 +185,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase {
                 try {
                     QuerySearchResultProvider querySearchResultProvider = service.executeQueryPhase(
                         new ShardSearchLocalRequest(indexShard.shardId(), 1, SearchType.DEFAULT,
-                            new SearchSourceBuilder(), new String[0], false, new AliasFilter(null, Strings.EMPTY_ARRAY)),
+                            new SearchSourceBuilder(), new String[0], false, new AliasFilter(null, Strings.EMPTY_ARRAY), 1.0f),
                         new SearchTask(123L, "", "", "", null));
                     IntArrayList intCursors = new IntArrayList(1);
                     intCursors.add(0);
@@ -220,7 +220,8 @@ public class SearchServiceTests extends ESSingleNodeTestCase {
                 new SearchSourceBuilder(),
                 new String[0],
                 false,
-                new AliasFilter(null, Strings.EMPTY_ARRAY)),
+                new AliasFilter(null, Strings.EMPTY_ARRAY),
+                1.0f),
             null);
         // the search context should inherit the default timeout
         assertThat(contextWithDefaultTimeout.timeout(), equalTo(TimeValue.timeValueSeconds(5)));
@@ -234,7 +235,8 @@ public class SearchServiceTests extends ESSingleNodeTestCase {
                 new SearchSourceBuilder().timeout(TimeValue.timeValueSeconds(seconds)),
                 new String[0],
                 false,
-                new AliasFilter(null, Strings.EMPTY_ARRAY)),
+                new AliasFilter(null, Strings.EMPTY_ARRAY),
+                1.0f),
             null);
         // the search context should inherit the query timeout
         assertThat(context.timeout(), equalTo(TimeValue.timeValueSeconds(seconds)));