Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This closes #532
This commit is contained in:
Guillaume Nodet 2021-09-09 16:10:25 +02:00 committed by Michael Osipov
parent 6c7d105916
commit c8d5ba3705
1 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
View File

@ -22,8 +22,11 @@ package org.apache.maven.graph;
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;
@ -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.
@ -59,6 +66,16 @@ public class DefaultProjectDependencyGraph
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 );
}
}
/**
@ -78,6 +95,16 @@ public class DefaultProjectDependencyGraph
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 );
}
}
/**
@ -140,15 +167,13 @@ public class DefaultProjectDependencyGraph
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;
}
@ -158,4 +183,12 @@ public class DefaultProjectDependencyGraph
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 );
}
}
}