|
17 | 17 | import org.apache.http.client.CredentialsProvider; |
18 | 18 | import org.apache.http.impl.client.BasicCredentialsProvider; |
19 | 19 | import org.apache.logging.log4j.core.config.plugins.util.PluginManager; |
| 20 | +import org.apache.lucene.util.IOConsumer; |
20 | 21 | import org.elasticsearch.client.Request; |
21 | 22 | import org.elasticsearch.client.Response; |
22 | 23 | import org.elasticsearch.client.ResponseException; |
|
30 | 31 | import org.elasticsearch.inference.TaskType; |
31 | 32 | import org.elasticsearch.logging.LogManager; |
32 | 33 | import org.elasticsearch.logging.Logger; |
| 34 | +import org.elasticsearch.test.ESTestCase; |
33 | 35 | import org.elasticsearch.test.rest.ESRestTestCase; |
34 | 36 | import org.elasticsearch.xcontent.XContentType; |
35 | 37 |
|
|
43 | 45 | import java.util.List; |
44 | 46 | import java.util.Map; |
45 | 47 | import java.util.Set; |
| 48 | +import java.util.concurrent.Semaphore; |
46 | 49 | import java.util.regex.Matcher; |
47 | 50 | import java.util.regex.Pattern; |
48 | 51 | import java.util.stream.Collectors; |
|
55 | 58 | import static org.elasticsearch.xpack.esql.EsqlTestUtils.reader; |
56 | 59 |
|
57 | 60 | public class CsvTestsDataLoader { |
| 61 | + private static final int PARALLEL_THREADS = 10; |
58 | 62 | private static final int BULK_DATA_SIZE = 100_000; |
59 | 63 | private static final TestDataset EMPLOYEES = new TestDataset("employees", "mapping-default.json", "employees.csv").noSubfields(); |
60 | 64 | private static final TestDataset EMPLOYEES_INCOMPATIBLE = new TestDataset( |
@@ -421,16 +425,39 @@ private static void loadDataSetIntoEs( |
421 | 425 | IndexCreator indexCreator |
422 | 426 | ) throws IOException { |
423 | 427 | Logger logger = LogManager.getLogger(CsvTestsDataLoader.class); |
| 428 | + List<TestDataset> datasets = availableDatasetsForEs( |
| 429 | + supportsIndexModeLookup, |
| 430 | + supportsSourceFieldMapping, |
| 431 | + inferenceEnabled, |
| 432 | + timeSeriesOnly |
| 433 | + ).stream().toList(); |
| 434 | + |
| 435 | + executeInParallel(datasets, dataset -> createIndex(client, dataset, indexCreator), "Failed to create indices in parallel"); |
| 436 | + |
| 437 | + executeInParallel(datasets, dataset -> loadData(client, dataset, logger), "Failed to load data in parallel"); |
| 438 | + |
| 439 | + forceMerge(client, datasets.stream().map(d -> d.indexName).collect(Collectors.toSet()), logger); |
| 440 | + |
| 441 | + executeInParallel( |
| 442 | + ENRICH_POLICIES, |
| 443 | + policy -> loadEnrichPolicy(client, policy.policyName, policy.policyFileName, logger), |
| 444 | + "Failed to load enrich policies in parallel" |
| 445 | + ); |
424 | 446 |
|
425 | | - Set<String> loadedDatasets = new HashSet<>(); |
426 | | - for (var dataset : availableDatasetsForEs(supportsIndexModeLookup, supportsSourceFieldMapping, inferenceEnabled, timeSeriesOnly)) { |
427 | | - load(client, dataset, logger, indexCreator); |
428 | | - loadedDatasets.add(dataset.indexName); |
429 | | - } |
430 | | - forceMerge(client, loadedDatasets, logger); |
431 | | - for (var policy : ENRICH_POLICIES) { |
432 | | - loadEnrichPolicy(client, policy.policyName, policy.policyFileName, logger); |
433 | | - } |
| 447 | + } |
| 448 | + |
| 449 | + private static <T> void executeInParallel(List<T> items, IOConsumer<T> consumer, String errorMessage) { |
| 450 | + Semaphore semaphore = new Semaphore(PARALLEL_THREADS); |
| 451 | + ESTestCase.runInParallel(items.size(), i -> { |
| 452 | + try { |
| 453 | + semaphore.acquire(); |
| 454 | + consumer.accept(items.get(i)); |
| 455 | + } catch (IOException | InterruptedException e) { |
| 456 | + throw new RuntimeException(errorMessage, e); |
| 457 | + } finally { |
| 458 | + semaphore.release(); |
| 459 | + } |
| 460 | + }); |
434 | 461 | } |
435 | 462 |
|
436 | 463 | public static void createInferenceEndpoints(RestClient client) throws IOException { |
@@ -587,11 +614,13 @@ private static URL getResource(String name) { |
587 | 614 | return result; |
588 | 615 | } |
589 | 616 |
|
590 | | - private static void load(RestClient client, TestDataset dataset, Logger logger, IndexCreator indexCreator) throws IOException { |
| 617 | + private static void createIndex(RestClient client, TestDataset dataset, IndexCreator indexCreator) throws IOException { |
591 | 618 | URL mapping = getResource("/" + dataset.mappingFileName); |
592 | 619 | Settings indexSettings = dataset.readSettingsFile(); |
593 | 620 | indexCreator.createIndex(client, dataset.indexName, readMappingFile(mapping, dataset.typeMapping), indexSettings); |
| 621 | + } |
594 | 622 |
|
| 623 | + private static void loadData(RestClient client, TestDataset dataset, Logger logger) throws IOException { |
595 | 624 | // Some examples only test that the query and mappings are valid, and don't need example data. Use .noData() for those |
596 | 625 | if (dataset.dataFileName != null) { |
597 | 626 | URL data = getResource("/data/" + dataset.dataFileName); |
|
0 commit comments