mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Check index before indexing array, and add common prefix to start of diff

Browse source
This commit is contained in:
Jackson Schuster 2024-03-01 12:42:27 -08:00
parent 2b3389d842
commit eafa1ba769
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/SourceBuild/content/Directory.Build.props
View file

@ -34,7 +34,7 @@
<RootRepo Condition="'$(ShortStack)' == 'true'">runtime</RootRepo>
</PropertyGroup>
<!-- See https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/Unified-Build-Controls.md#output-controls for
<!-- See https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/Unified-Build-Controls.md#output-controls for
control set definition. -->
<PropertyGroup Label="CalculateArch">
<!-- Build architecture is what we are building on. -->
@ -212,6 +212,5 @@
<PoisonedReportFile>$(PackageReportDir)poisoned.txt</PoisonedReportFile>
</PropertyGroup>
<Import Project="$(GitInfoAllRepoPropsFile)" />
</Project>

13
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs
View file

@ -49,13 +49,13 @@ static class Diff
// Edit distance algorithm: https://en.wikipedia.org/wiki/Longest_common_subsequence
// cancellationToken.ThrowIfCancellationRequested();
formatter ??= static s => s;
List<(string, DifferenceKind)> diff = [];
// Optimization: remove common prefix
int i = 0;
List<(string, DifferenceKind)> prefix = [];
while (i < baselineSequence.Length && i < testSequence.Length && equalityComparer(baselineSequence[i], testSequence[i]))
{
diff.Add((formatter(baselineSequence[i]), DifferenceKind.Unchanged));
prefix.Add((formatter(baselineSequence[i]), DifferenceKind.Unchanged));
i++;
}
@ -93,13 +93,11 @@ static class Diff
// Trace back the edits
int row = baselineSequence.Length;
int col = testSequence.Length;
List<(string, DifferenceKind)> diff = [];
while (row > 0 || col > 0)
{
cancellationToken.ThrowIfCancellationRequested();
var baselineItem = baselineSequence[row - 1];
var testItem = testSequence[col - 1];
if (row > 0 && col > 0 && equalityComparer(baselineItem, testItem))
if (row > 0 && col > 0 && equalityComparer(baselineSequence[row - 1], testSequence[col - 1]))
{
diff.Add((formatter(baselineSequence[row - 1]), DifferenceKind.Unchanged));
row--;
@ -121,7 +119,8 @@ static class Diff
}
}
diff.Reverse();
return diff;
prefix.AddRange(diff);
return prefix;
}
}

1
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj
View file

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>exe</OutputType>
<TargetFramework>$(NetCurrent)</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>