Consistent Indices API: Made GET warmers consistent

Added support for /{index}/_warmers/{type}
Also added spec and integration tests to support wildcards and _all in
warmer names

Relates elastic#4071

Author: spinscale

rest-api-spec/test/indices.put_warmer/10_basic.yaml

@@ -1,9 +1,13 @@
 ---
-"Basic test for warmers":
+setup:
   - do:
       indices.create:
         index: test_index
 
+  - do:
+      indices.create:
+        index: test_idx
+
   - do:
       cluster.health:
         wait_for_status: yellow
@@ -14,6 +18,14 @@
         index: test_index
         name: test_warmer
 
+  - do:
+      indices.put_warmer:
+        index: test_idx
+        name: test_warmer2
+        body:
+          query:
+            match_all: {}
+
   - do:
       indices.put_warmer:
         index: test_index
@@ -22,6 +34,8 @@
           query:
             match_all: {}
 
+---
+"Basic test for warmers":
   - do:
       indices.get_warmer:
         index: test_index
@@ -39,3 +53,48 @@
       indices.get_warmer:
         index: test_index
         name: test_warmer
+
+---
+"Getting warmers for several indices should work using *":
+
+  - do:
+      indices.get_warmer:
+        index: '*'
+        name: '*'
+
+  - match: {test_index.warmers.test_warmer.source.query.match_all: {}}
+  - match: {test_idx.warmers.test_warmer2.source.query.match_all: {}}
+
+---
+"Getting warmers for several indices should work using _all":
+
+  - do:
+      indices.get_warmer:
+        index: _all
+        name: _all
+
+  - match: {test_index.warmers.test_warmer.source.query.match_all: {}}
+  - match: {test_idx.warmers.test_warmer2.source.query.match_all: {}}
+
+---
+"Getting warmers for several indices should work using prefix*":
+
+  - do:
+      indices.get_warmer:
+        index: test_i*
+        name: test_w*
+
+  - match: {test_index.warmers.test_warmer.source.query.match_all: {}}
+  - match: {test_idx.warmers.test_warmer2.source.query.match_all: {}}
+
+---
+"Getting warmers for several indices should work using comma-separated lists":
+
+  - do:
+      indices.get_warmer:
+        index: test_index,test_idx
+        name: test_warmer,test_warmer2
+
+  - match: {test_index.warmers.test_warmer.source.query.match_all: {}}
+  - match: {test_idx.warmers.test_warmer2.source.query.match_all: {}}
+

src/main/java/org/elasticsearch/cluster/metadata/MetaData.java

@@ -376,12 +376,19 @@ public ImmutableOpenMap<String, ImmutableOpenMap<String, MappingMetaData>> findM
         return indexMapBuilder.build();
     }
 
-    public ImmutableOpenMap<String, ImmutableList<IndexWarmersMetaData.Entry>> findWarmers(String[] concreteIndices, final String[] types, final String[] warmers) {
-        assert warmers != null;
+    public ImmutableOpenMap<String, ImmutableList<IndexWarmersMetaData.Entry>> findWarmers(String[] concreteIndices, final String[] types, final String[] uncheckedWarmers) {
+        assert uncheckedWarmers != null;
         assert concreteIndices != null;
         if (concreteIndices.length == 0) {
             return ImmutableOpenMap.of();
         }
+        // special _all check to behave the same like not specifying anything
+        final String[] warmers;
+        if (uncheckedWarmers.length == 1 && "_all".equals(uncheckedWarmers[0])) {
+            warmers = Strings.EMPTY_ARRAY;
+        } else {
+            warmers = uncheckedWarmers;
+        }
 
         ImmutableOpenMap.Builder<String, ImmutableList<IndexWarmersMetaData.Entry>> mapBuilder = ImmutableOpenMap.builder();
         Iterable<String> intersection = HppcMaps.intersection(ObjectOpenHashSet.from(concreteIndices), indices.keys());

src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/get/RestGetWarmerAction.java

@@ -51,6 +51,7 @@ public RestGetWarmerAction(Settings settings, Client client, RestController cont
 
         controller.registerHandler(GET, "/{index}/_warmer", this);
         controller.registerHandler(GET, "/{index}/_warmer/{name}", this);
+        controller.registerHandler(GET, "/{index}/_warmers/{name}", this);
         controller.registerHandler(GET, "/{index}/{type}/_warmer/{name}", this);
     }
 

src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java

@@ -231,6 +231,36 @@ public void ensureThatIndexWarmersCanBeChangedOnRuntime() throws Exception {
         assertThat(getWarmerRuns(), equalTo(warmerRunsAfterDisabling));
     }
 
+    @Test
+    public void gettingAllWarmersUsingAllAndWildcardsShouldWork() throws Exception {
+        client().admin().indices().prepareCreate("test")
+                .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1, "index.number_of_replicas", 0))
+                .execute().actionGet();
+        ensureGreen();
+
+        PutWarmerResponse putWarmerResponse = client().admin().indices().preparePutWarmer("custom_warmer")
+                .setSearchRequest(client().prepareSearch("test").setTypes("test").setQuery(QueryBuilders.matchAllQuery()))
+                .execute().actionGet();
+        assertThat(putWarmerResponse.isAcknowledged(), equalTo(true));
+
+        PutWarmerResponse anotherPutWarmerResponse = client().admin().indices().preparePutWarmer("second_custom_warmer")
+                .setSearchRequest(client().prepareSearch("test").setTypes("test").setQuery(QueryBuilders.matchAllQuery()))
+                .execute().actionGet();
+        assertThat(anotherPutWarmerResponse.isAcknowledged(), equalTo(true));
+
+        GetWarmersResponse getWarmersResponse = client().admin().indices().prepareGetWarmers("*").addWarmers("*").get();
+        assertThat(getWarmersResponse.warmers().size(), is(1));
+
+        getWarmersResponse = client().admin().indices().prepareGetWarmers("_all").addWarmers("_all").get();
+        assertThat(getWarmersResponse.warmers().size(), is(1));
+
+        getWarmersResponse = client().admin().indices().prepareGetWarmers("t*").addWarmers("c*").get();
+        assertThat(getWarmersResponse.warmers().size(), is(1));
+
+        getWarmersResponse = client().admin().indices().prepareGetWarmers("test").addWarmers("custom_warmer", "second_custom_warmer").get();
+        assertThat(getWarmersResponse.warmers().size(), is(1));
+    }
+
     private long getWarmerRuns() {
         IndicesStatsResponse indicesStatsResponse = client().admin().indices().prepareStats("test").clear().setWarmer(true).execute().actionGet();
         return indicesStatsResponse.getIndex("test").getPrimaries().warmer.total();