Search Queries in parallel - part 1 (elastic#116812)

Runs some spots in parallel to increase test execution performance and get some coverage on parallel query execution

Author: drempapis

server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java

@@ -50,6 +50,7 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertRequestBuilderThrows;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponses;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
@@ -843,24 +844,13 @@ public void testMultipleTemplate() throws IOException {
 
         ensureGreen();
 
-        // ax -> matches template
-        assertResponse(
+        assertResponses(response -> {
+            assertHitCount(response, 1);
+            assertEquals("value1", response.getHits().getAt(0).field("field1").getValue().toString());
+            assertNull(response.getHits().getAt(0).field("field2"));
+        },
             prepareSearch("ax").setQuery(termQuery("field1", "value1")).addStoredField("field1").addStoredField("field2"),
-            response -> {
-                assertHitCount(response, 1);
-                assertEquals("value1", response.getHits().getAt(0).field("field1").getValue().toString());
-                assertNull(response.getHits().getAt(0).field("field2"));
-            }
-        );
-
-        // bx -> matches template
-        assertResponse(
-            prepareSearch("bx").setQuery(termQuery("field1", "value1")).addStoredField("field1").addStoredField("field2"),
-            response -> {
-                assertHitCount(response, 1);
-                assertEquals("value1", response.getHits().getAt(0).field("field1").getValue().toString());
-                assertNull(response.getHits().getAt(0).field("field2"));
-            }
+            prepareSearch("bx").setQuery(termQuery("field1", "value1")).addStoredField("field1").addStoredField("field2")
         );
     }
 

server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RandomSamplerIT.java

@@ -10,6 +10,7 @@
 package org.elasticsearch.search.aggregations.bucket;
 
 import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.sampler.random.InternalRandomSampler;
 import org.elasticsearch.search.aggregations.bucket.sampler.random.RandomSamplerAggregationBuilder;
@@ -20,11 +21,13 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.IntStream;
 
 import static org.elasticsearch.search.aggregations.AggregationBuilders.avg;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.histogram;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponses;
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.lessThan;
 
@@ -112,27 +115,28 @@ public void testRandomSamplerConsistentSeed() {
             }
         );
 
-        for (int i = 0; i < NUM_SAMPLE_RUNS; i++) {
-            assertResponse(
-                prepareSearch("idx").setPreference("shard:0")
-                    .addAggregation(
-                        new RandomSamplerAggregationBuilder("sampler").setProbability(PROBABILITY)
-                            .setSeed(0)
-                            .subAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE))
-                            .subAggregation(avg("mean_numeric").field(NUMERIC_VALUE))
-                            .setShardSeed(42)
-                    ),
-                response -> {
-                    InternalRandomSampler sampler = response.getAggregations().get("sampler");
-                    double monotonicValue = ((Avg) sampler.getAggregations().get("mean_monotonic")).getValue();
-                    double numericValue = ((Avg) sampler.getAggregations().get("mean_numeric")).getValue();
-                    long docCount = sampler.getDocCount();
-                    assertEquals(monotonicValue, sampleMonotonicValue[0], tolerance);
-                    assertEquals(numericValue, sampleNumericValue[0], tolerance);
-                    assertEquals(docCount, sampledDocCount[0]);
-                }
-            );
-        }
+        assertResponses(response -> {
+            InternalRandomSampler sampler = response.getAggregations().get("sampler");
+            double monotonicValue = ((Avg) sampler.getAggregations().get("mean_monotonic")).getValue();
+            double numericValue = ((Avg) sampler.getAggregations().get("mean_numeric")).getValue();
+            long docCount = sampler.getDocCount();
+            assertEquals(monotonicValue, sampleMonotonicValue[0], tolerance);
+            assertEquals(numericValue, sampleNumericValue[0], tolerance);
+            assertEquals(docCount, sampledDocCount[0]);
+        },
+            IntStream.rangeClosed(0, NUM_SAMPLE_RUNS - 1)
+                .mapToObj(
+                    num -> prepareSearch("idx").setPreference("shard:0")
+                        .addAggregation(
+                            new RandomSamplerAggregationBuilder("sampler").setProbability(PROBABILITY)
+                                .setSeed(0)
+                                .subAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE))
+                                .subAggregation(avg("mean_numeric").field(NUMERIC_VALUE))
+                                .setShardSeed(42)
+                        )
+                )
+                .toArray(SearchRequestBuilder[]::new)
+        );
     }
 
     public void testRandomSampler() {