Skip to content

Speed up Resolve-Path relative path resolution #19171

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
iSazonov merged 2 commits into from
Mar 15, 2023
Merged

Speed up Resolve-Path relative path resolution #19171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e979f01
Speed up Resolve-Path relative path resolution.
MartinGC94 Feb 17, 2023
44c9ea8
Rename vars and use spans.
MartinGC94 Mar 14, 2023
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
15 changes: 15 additions & 0 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ protected override void ProcessRecord()

if (_relative)
{
ReadOnlySpan<char> baseCache = null;
ReadOnlySpan<char> adjustedBaseCache = null;
foreach (PathInfo currentPath in result)
{
// When result path and base path is on different PSDrive
Expand All @@ -116,8 +118,18 @@ protected override void ProcessRecord()
continue;
}

int leafIndex = currentPath.Path.LastIndexOf(currentPath.Provider.ItemSeparator);
var basePath = currentPath.Path.AsSpan(0, leafIndex);
if (basePath == baseCache)
{
WriteObject(string.Concat(adjustedBaseCache, currentPath.Path.AsSpan(leafIndex + 1)), enumerateCollection: false);
continue;
}

baseCache = basePath;
string adjustedPath = SessionState.Path.NormalizeRelativePath(currentPath.Path,
SessionState.Path.CurrentLocation.ProviderPath);

// Do not insert './' if result path is not relative
if (!adjustedPath.StartsWith(
currentPath.Drive?.Root ?? currentPath.Path, StringComparison.OrdinalIgnoreCase) &&
Expand All @@ -126,6 +138,9 @@ protected override void ProcessRecord()
adjustedPath = SessionState.Path.Combine(".", adjustedPath);
}

leafIndex = adjustedPath.LastIndexOf(currentPath.Provider.ItemSeparator);
adjustedBaseCache = adjustedPath.AsSpan(0, leafIndex + 1);

WriteObject(adjustedPath, enumerateCollection: false);
}
}
Expand Down