Skip to content

[MNG-7235] Speed improvements when calculating the sorted project graph #530

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

Closed
wants to merge 2 commits into from
Closed

[MNG-7235] Speed improvements when calculating the sorted project graph #530

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f7781
[MNG-7235] Speed improvements when calculating the sorted project graph
gnodet Sep 9, 2021
9f1115d
Use for loops and initialize the collection with the correct size
gnodet Sep 27, 2021
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
49 changes: 41 additions & 8 deletions maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;

Expand All @@ -42,9 +45,13 @@ public class DefaultProjectDependencyGraph
implements ProjectDependencyGraph
{

private ProjectSorter sorter;
private final ProjectSorter sorter;

private List<MavenProject> allProjects;
private final List<MavenProject> allProjects;

private final Map<MavenProject, Integer> order;

private final Map<String, MavenProject> projects;

/**
* Creates a new project dependency graph based on the specified projects.
Expand All @@ -59,6 +66,16 @@ public DefaultProjectDependencyGraph( Collection<MavenProject> projects )
super();
this.allProjects = Collections.unmodifiableList( new ArrayList<>( projects ) );
this.sorter = new ProjectSorter( projects );
this.order = new HashMap<>();
this.projects = new HashMap<>();
List<MavenProject> sorted = this.sorter.getSortedProjects();
for ( int index = 0; index < sorted.size(); index++ )
{
MavenProject project = sorted.get( index );
String id = ProjectSorter.getId( project );
this.projects.put( id, project );
this.order.put( project, index );
}
}

/**
Expand All @@ -78,6 +95,16 @@ public DefaultProjectDependencyGraph( final List<MavenProject> allProjects,
super();
this.allProjects = Collections.unmodifiableList( new ArrayList<>( allProjects ) );
this.sorter = new ProjectSorter( projects );
this.order = new HashMap<>();
this.projects = new HashMap<>();
List<MavenProject> sorted = this.sorter.getSortedProjects();
for ( int index = 0; index < sorted.size(); index++ )
{
MavenProject project = sorted.get( index );
String id = ProjectSorter.getId( project );
this.projects.put( id, project );
this.order.put( project, index );
}
}

/**
Expand Down Expand Up @@ -140,15 +167,13 @@ private void getUpstreamProjects( String projectId, Collection<String> projectId
private List<MavenProject> getSortedProjects( Set<String> projectIds )
{
List<MavenProject> result = new ArrayList<>( projectIds.size() );

for ( MavenProject mavenProject : sorter.getSortedProjects() )
for ( String projectId : projectIds )
{
if ( projectIds.contains( ProjectSorter.getId( mavenProject ) ) )
{
result.add( mavenProject );
}
result.add( projects.get( projectId ) );
}

Collections.sort( result, new MavenProjectComparator() );

return result;
}

Expand All @@ -158,4 +183,12 @@ public String toString()
return sorter.getSortedProjects().toString();
}

private class MavenProjectComparator implements Comparator<MavenProject>
{
@Override
public int compare( MavenProject o1, MavenProject o2 )
{
return order.get( o1 ) - order.get( o2 );
}
}
}