Added API to provide mutiple regex patterns for enumerating files. #922
Conversation
This file contains 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
codito
reviewed
Jul 11, 2017
|
|
||
| var extensionAssemblies = new List<string>(this.fileHelper.EnumerateFiles(adapterPath, patterns, SearchOption.AllDirectories)); |
There was a problem hiding this comment.
Not sure if the responsibility to combine and create a regex should be with EnumerateFiles.
codito
reviewed
Jul 11, 2017
| extensionAssemblies.AddRange(this.fileHelper.EnumerateFiles(adapterPath, TestPlatformConstants.TestLoggerRegexPattern, SearchOption.AllDirectories)); | ||
| extensionAssemblies.AddRange(this.fileHelper.EnumerateFiles(adapterPath, TestPlatformConstants.RunTimeRegexPattern, SearchOption.AllDirectories)); | ||
| extensionAssemblies.AddRange(this.fileHelper.EnumerateFiles(adapterPath, TestPlatformConstants.SettingsProviderRegexPattern, SearchOption.AllDirectories)); | ||
| var patterns = new string[] { TestPlatformConstants.TestAdapterRegexPattern, TestPlatformConstants.TestLoggerRegexPattern, TestPlatformConstants.RunTimeRegexPattern, TestPlatformConstants.SettingsProviderRegexPattern }; |
There was a problem hiding this comment.
If all these patterns are known why not Regex.Compile it directly in this class. We will save some time during runtime?
…into fileHelperAPI
|
quick question: How much of a perf benefit did this net us? Just curious. |
codito
reviewed
Jul 12, 2017
| extensionAssemblies.AddRange(this.fileHelper.EnumerateFiles(adapterPath, TestPlatformConstants.RunTimeRegexPattern, SearchOption.AllDirectories)); | ||
| extensionAssemblies.AddRange(this.fileHelper.EnumerateFiles(adapterPath, TestPlatformConstants.SettingsProviderRegexPattern, SearchOption.AllDirectories)); | ||
|
|
||
| var patterns = new string[] { TestPlatformConstants.TestAdapterRegexPattern, TestPlatformConstants.TestLoggerRegexPattern, TestPlatformConstants.RunTimeRegexPattern, TestPlatformConstants.SettingsProviderRegexPattern }; |
| @@ -184,8 +184,7 @@ private void InitializeExtensions(IEnumerable<string> sources) | |||
|
|
|||
| if (TestPluginCache.Instance.PathToExtensions != null) | |||
| { | |||
| var regex = new Regex(TestPlatformConstants.TestAdapterRegexPattern, RegexOptions.IgnoreCase); | |||
| extensions.AddRange(TestPluginCache.Instance.PathToExtensions.Where(ext => regex.IsMatch(ext))); | |||
| extensions.AddRange(TestPluginCache.Instance.PathToExtensions.Where(ext => TestExecutorExtensionManager.Regex.IsMatch(ext))); | |||
There was a problem hiding this comment.
Should these be different regular expression than the discovery one?
| @@ -17,6 +18,8 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework | |||
| /// </summary> | |||
| internal class DataCollectorExtensionManager : TestExtensionManager<DataCollector, IDataCollectorCapabilities> | |||
| { | |||
| public static Regex Regex = new Regex(TestPlatformConstants.DataCollectorRegexPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase); | |||
There was a problem hiding this comment.
nit: can be more specific name?
| extensionAssemblies.AddRange(this.fileHelper.EnumerateFiles(adapterPath, TestPlatformConstants.RunTimeRegexPattern, SearchOption.AllDirectories)); | ||
| extensionAssemblies.AddRange(this.fileHelper.EnumerateFiles(adapterPath, TestPlatformConstants.SettingsProviderRegexPattern, SearchOption.AllDirectories)); | ||
|
|
||
| var patterns = new string[] { TestPlatformConstants.TestAdapterRegexPattern, TestPlatformConstants.TestLoggerRegexPattern, TestPlatformConstants.RunTimeRegexPattern, TestPlatformConstants.SettingsProviderRegexPattern }; |
There was a problem hiding this comment.
Most of the patterns are compatible with string.EndsWith. Do we know how does string comparison compare with regex? Is there any observable startup time impact in regex compiled?
There was a problem hiding this comment.
On measuring perf, it is observed that String.EndsWith performs better than Regex, therefore switched to String.EndsWith approach.
codito
approved these changes
Jul 14, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Added API to provide mutiple regex patterns for enumerating files.
This should give perf benefit as Directory.EnumerateFiles is called only once and files names are matched using multiple regex patterns.
It is bound to give an improvement of around 5-8%