Skip to content

Fix parallel tests execution, fix potential collisions, cache only regexes #2092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbjornu merged 2 commits into from
Feb 11, 2020
Merged

Fix parallel tests execution, fix potential collisions, cache only regexes #2092

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b639132
fix parallel tests execution, fix potential collisions, cache only re…
Inok Feb 11, 2020
bc2fc37
Merge branch 'master' into fix/parallel-tests-failures
arturcic Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 32 additions & 41 deletions src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
Expand All @@ -23,6 +24,11 @@ public static class IncrementStrategyFinder
public const string DefaultPatchPattern = @"\+semver:\s?(fix|patch)";
public const string DefaultNoBumpPattern = @"\+semver:\s?(none|skip)";

private static readonly Regex DefaultMajorPatternRegex = new Regex(DefaultMajorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex DefaultMinorPatternRegex = new Regex(DefaultMinorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex DefaultPatchPatternRegex = new Regex(DefaultPatchPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex DefaultNoBumpPatternRegex = new Regex(DefaultNoBumpPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);

public static VersionField? DetermineIncrementedField(GitVersionContext context, BaseVersion baseVersion)
{
var commitMessageIncrement = FindCommitMessageIncrement(context, baseVersion);
Expand Down Expand Up @@ -69,13 +75,10 @@ public static class IncrementStrategyFinder

public static VersionField? GetIncrementForCommits(GitVersionContext context, IEnumerable<Commit> commits)
{
// More efficient use of Regexes. The static version of Regex.IsMatch caches the compiled regexes.
// see: https://docs.microsoft.com/en-us/dotnet/standard/base-types/best-practices#static-regular-expressions

var majorRegex = context.Configuration.MajorVersionBumpMessage ?? DefaultMajorPattern;
var minorRegex = context.Configuration.MinorVersionBumpMessage ?? DefaultMinorPattern;
var patchRegex = context.Configuration.PatchVersionBumpMessage ?? DefaultPatchPattern;
var none = context.Configuration.NoBumpMessage ?? DefaultNoBumpPattern;
var majorRegex = TryGetRegexOrDefault(context.Configuration.MajorVersionBumpMessage, DefaultMajorPatternRegex);
var minorRegex = TryGetRegexOrDefault(context.Configuration.MinorVersionBumpMessage, DefaultMinorPatternRegex);
var patchRegex = TryGetRegexOrDefault(context.Configuration.PatchVersionBumpMessage, DefaultPatchPatternRegex);
var none = TryGetRegexOrDefault(context.Configuration.NoBumpMessage, DefaultNoBumpPatternRegex);

var increments = commits
.Select(c => GetIncrementFromMessage(c.Message, majorRegex, minorRegex, patchRegex, none))
Expand All @@ -91,23 +94,36 @@ public static class IncrementStrategyFinder
return null;
}

private static Regex TryGetRegexOrDefault(string messageRegex, Regex defaultRegex)
{
if (messageRegex == null)
{
return defaultRegex;
}

return CompiledRegexCache.GetOrAdd(messageRegex, pattern => new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase));
}

private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Commit baseCommit, Commit headCommit)
{
if (baseCommit == null) yield break;

if (intermediateCommitCache == null || intermediateCommitCache.LastOrDefault() != headCommit)
var commitCache = intermediateCommitCache;

if (commitCache == null || commitCache.LastOrDefault() != headCommit)
{
var filter = new CommitFilter
{
IncludeReachableFrom = headCommit,
SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
};

intermediateCommitCache = repo.Commits.QueryBy(filter).ToList();
commitCache = repo.Commits.QueryBy(filter).ToList();
intermediateCommitCache = commitCache;
}

var found = false;
foreach (var commit in intermediateCommitCache)
foreach (var commit in commitCache)
{
if (found)
yield return commit;
Expand All @@ -117,41 +133,16 @@ private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Comm
}
}

private static VersionField? GetIncrementFromMessage(string message, string majorRegex, string minorRegex, string patchRegex, string none)
private static VersionField? GetIncrementFromMessage(string message, Regex majorRegex, Regex minorRegex, Regex patchRegex, Regex none)
{
var key = message.GetHashCode();

if (!VersionFieldCache.TryGetValue(key, out var version))
{
version = FindIncrementFromMessage(message, majorRegex, minorRegex, patchRegex, none);
VersionFieldCache[key] = version;
}
return version;
}

private static VersionField? FindIncrementFromMessage(string message, string majorRegex, string minorRegex, string patchRegex, string noneRegex)
{
if (IsMatch(message, majorRegex)) return VersionField.Major;
if (IsMatch(message, minorRegex)) return VersionField.Minor;
if (IsMatch(message, patchRegex)) return VersionField.Patch;
if (IsMatch(message, noneRegex)) return VersionField.None;
if (majorRegex.IsMatch(message)) return VersionField.Major;
if (minorRegex.IsMatch(message)) return VersionField.Minor;
if (patchRegex.IsMatch(message)) return VersionField.Patch;
if (none.IsMatch(message)) return VersionField.None;
return null;
}

private static bool IsMatch(string message, string regex)
{
var key = message.GetHashCode() ^ regex.GetHashCode();

if (!MatchCache.TryGetValue(key, out var match))
{
match = Regex.IsMatch(message, regex, RegexOptions.IgnoreCase);
MatchCache[key] = match;
}
return match;
}

private static readonly IDictionary<int, bool> MatchCache = new Dictionary<int, bool>();
private static readonly IDictionary<int, VersionField?> VersionFieldCache = new Dictionary<int, VersionField?>();
private static readonly ConcurrentDictionary<string, Regex> CompiledRegexCache = new ConcurrentDictionary<string, Regex>();

public static VersionField FindDefaultIncrementForBranch(GitVersionContext context, string branch = null)
{
Expand Down