Skip to content

[MRESOLVER-228] skip & reconcile #136

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
caiwei-ebay wants to merge 1 commit into from
Closed

[MRESOLVER-228] skip & reconcile #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,17 +362,17 @@ public int hashCode()

static final class GraphKey
{
private final Artifact artifact;
final Artifact artifact;

private final List<RemoteRepository> repositories;
final List<RemoteRepository> repositories;

private final DependencySelector selector;
final DependencySelector selector;

private final DependencyManager manager;
final DependencyManager manager;

private final DependencyTraverser traverser;
final DependencyTraverser traverser;

private final VersionFilter filter;
final VersionFilter filter;

private final int hashCode;

Expand Down
118 changes: 101 additions & 17 deletions ...pl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,20 @@
public class DefaultDependencyCollector
implements DependencyCollector, Service
{
/**
* The key in the repository session's {@link org.eclipse.aether.RepositorySystemSession#getConfigProperties()
* configuration properties} used to store a {@link Boolean} flag controlling the resolver's skip & reconcile mode.
*
* @since 1.7.3
*/
public static final String CONFIG_PROP_USE_SKIP_RECONCILE = "aether.dependencyCollector.useSkipReconcile";

/**
* The default value for {@link #CONFIG_PROP_USE_SKIP_RECONCILE}, {@code true}.
*
* @since 1.7.3
*/
public static final boolean CONFIG_PROP_USE_SKIP_RECONCILE_DEFAULT = true;

private static final String CONFIG_PROP_MAX_EXCEPTIONS = "aether.dependencyCollector.maxExceptions";

Expand Down Expand Up @@ -147,6 +161,14 @@ public CollectResult collectDependencies( RepositorySystemSession session, Colle
requireNonNull( request, "request cannot be null" );
session = optimizeSession( session );

boolean useSkipReconcile = ConfigUtils.getBoolean(
session, CONFIG_PROP_USE_SKIP_RECONCILE_DEFAULT, CONFIG_PROP_USE_SKIP_RECONCILE
);
if ( useSkipReconcile )
{
LOGGER.debug( "Collector skip & reconcile enabled" );
}

RequestTrace trace = RequestTrace.newChild( request.getTrace(), request );

CollectResult result = new CollectResult( request );
Expand Down Expand Up @@ -252,7 +274,10 @@ public CollectResult collectDependencies( RepositorySystemSession session, Colle

DefaultVersionFilterContext versionContext = new DefaultVersionFilterContext( session );

Args args = new Args( session, trace, pool, nodes, context, versionContext, request );
DependencyResolveReconciler dependencyResolveReconciler =
useSkipReconcile ? new DependencyResolveReconciler() : null;
Args args = new Args( session, trace, pool, nodes, dependencyResolveReconciler,
context, versionContext, request );
Results results = new Results( result, session );

process( args, results, dependencies, repositories,
Expand All @@ -261,6 +286,29 @@ public CollectResult collectDependencies( RepositorySystemSession session, Colle
depTraverser != null ? depTraverser.deriveChildTraverser( context ) : null,
verFilter != null ? verFilter.deriveChildFilter( context ) : null );

if ( args.reconciler != null )
{
//reconcile the skipped nodes
Collection<DependencyResolveReconciler.DependencyResolveSkip> reconcileNodes =
args.reconciler.getNodesToReconcile( session, result );
for ( DependencyResolveReconciler.DependencyResolveSkip skip : reconcileNodes )
{
LOGGER.debug( "Reconcile: {} ", skip );
Args newArgs =
new Args( session, trace, pool, new NodeStack(), args.reconciler, context, versionContext,
request );
DataPool.GraphKey key = skip.graphKey;
List<DependencyNode> parents = skip.parentPathsOfCurrentNode;
for ( DependencyNode parent : parents )
{
newArgs.nodes.push( parent );
}
newArgs.nodes.push( skip.node );
process( newArgs, results, skip.dependencies, key.repositories, key.selector, key.manager,
key.traverser, key.filter );
}
}

errorPath = results.errorPath;
}

Expand Down Expand Up @@ -491,29 +539,57 @@ private void doRecurse( Args args, Results results, List<RemoteRepository> repos
VersionFilter childFilter = verFilter != null ? verFilter.deriveChildFilter( context ) : null;

final List<RemoteRepository> childRepos =
args.ignoreRepos
? repositories
: remoteRepositoryManager.aggregateRepositories( args.session, repositories,
descriptorResult.getRepositories(), true );
args.ignoreRepos
? repositories
: remoteRepositoryManager.aggregateRepositories( args.session, repositories,
descriptorResult.getRepositories(), true );

Object key =
args.pool.toKey( d.getArtifact(), childRepos, childSelector, childManager, childTraverser, childFilter );
Object key = args.pool.toKey(
d.getArtifact(), childRepos, childSelector, childManager, childTraverser, childFilter
);

List<DependencyNode> children = args.pool.getChildren( key );
if ( children == null )
if ( args.reconciler == null )
{
args.pool.putChildren( key, child.getChildren() );
List<DependencyNode> children = args.pool.getChildren( key );
if ( children == null )
{
args.pool.putChildren( key, child.getChildren() );

args.nodes.push( child );
args.nodes.push( child );

process( args, results, descriptorResult.getDependencies(), childRepos, childSelector, childManager,
childTraverser, childFilter );
process( args, results, descriptorResult.getDependencies(), childRepos, childSelector, childManager,
childTraverser, childFilter );

args.nodes.pop();
args.nodes.pop();
}
else
{
child.setChildren( children );
}
}
else
{
child.setChildren( children );
List<DependencyNode> parents = args.nodes.getParentNodes();
int depth = parents.size() + 1; //the depth if pushed the child to stack
DependencyResolveReconciler.CacheResult result =
args.reconciler.findCandidateWithLowerDepth( child, depth );
if ( result != null )
{
//Do not set the children as the result can be most likely ignored(won't be picked up)
args.reconciler.addSkip( child, key, descriptorResult.getDependencies(), parents,
result.parentPathsOfCandidateLowerDepth );
LOGGER.trace( "Skipped resolving artifact {} of depth {}", child.getArtifact(), depth );
}
else
{
args.nodes.push( child );
LOGGER.trace( "Resolving artifact {} of depth {}", child.getArtifact(), depth );
process( args, results, descriptorResult.getDependencies(), childRepos, childSelector, childManager,
childTraverser, childFilter );
args.pool.putChildren( key, child.getChildren() );
args.reconciler.cacheChildrenWithDepth( child, parents );
args.nodes.pop();
}
}
}

Expand Down Expand Up @@ -706,9 +782,16 @@ static class Args

final CollectRequest request;

/**
* Nullable: is {@code null} if {@link #CONFIG_PROP_USE_SKIP_RECONCILE} evaluates to {@code false}.
*/
final DependencyResolveReconciler reconciler;

@SuppressWarnings( "checkstyle:parameternumber" )
Args( RepositorySystemSession session, RequestTrace trace, DataPool pool, NodeStack nodes,
DefaultDependencyCollectionContext collectionContext, DefaultVersionFilterContext versionContext,
CollectRequest request )
DependencyResolveReconciler reconciler,
DefaultDependencyCollectionContext collectionContext, DefaultVersionFilterContext versionContext,
CollectRequest request )
{
this.session = session;
this.request = request;
Expand All @@ -717,6 +800,7 @@ static class Args
this.trace = trace;
this.pool = pool;
this.nodes = nodes;
this.reconciler = reconciler;
this.collectionContext = collectionContext;
this.versionContext = versionContext;
}
Expand Down
Loading