Speedup individual CsvIt spec execution #145869
+67
−91
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -158,16 +158,16 @@ public static List<Object[]> readScriptSpec() throws Exception { | |
| return SpecReader.readScriptSpec(urls, specParser()); | ||
| } | ||
|
|
||
| @BeforeClass | ||
| public static void setupCluster() throws Exception { | ||
| long start = System.currentTimeMillis(); | ||
| logger.info("Creating test cluster"); | ||
| var nodeDirectory = createTempDir(); | ||
|
Contributor
Author
There was a problem hiding this comment.
|
||
| var configDirectory = nodeDirectory.resolve("config"); | ||
| createCustomRegexConfig(configDirectory); | ||
| cluster = new InternalTestCluster( | ||
| randomLong(), | ||
| nodeDirectory, | ||
| false, | ||
| true, | ||
| 1, | ||
|
|
@@ -184,7 +184,7 @@ public Settings nodeSettings(int nodeOrdinal, Settings otherSettings) { | |
|
|
||
| @Override | ||
| public java.nio.file.Path nodeConfigPath(int nodeOrdinal) { | ||
| return configDirectory; | ||
| } | ||
| }, | ||
| 0, | ||
|
|
@@ -550,18 +550,14 @@ public void ensureNoFailures() { | |
| } | ||
| } | ||
|
|
||
| private static void createCustomRegexConfig(Path configDir) throws IOException { | ||
| // create a subdir for the user-agent with custom regex files so we can test the USER_AGENT with the regex_file option | ||
| Path userAgentDir = configDir.resolve("user-agent"); | ||
| Files.createDirectories(userAgentDir); | ||
| try (InputStream is = CsvIT.class.getResourceAsStream("/custom-regexes.yml")) { | ||
| assert is != null : "custom-regexes.yml not found on classpath"; | ||
| Files.copy(is, userAgentDir.resolve("custom-regexes.yml")); | ||
| } | ||
| } | ||
|
|
||
| private static class ResponseListener extends PlainActionFuture<EsqlQueryResponse> { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CsvIT uses
EsqlTestUtils#classpathResourcesin order to discover and load spec files.Since EsqlTestUtils has to be laoded above static block was executed as well, initializing number of non trivial but unused dependencies adding ~1s (highlighted in the profile below) to initialization duration on my machine. Moving this code to its only usage.