You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Vincent Siveton <vi...@gmail.com> on 2008/12/11 13:30:43 UTC
Re: svn commit: r725604 - in /maven/mercury/trunk/mercury-md/mercury-md-sat/src: main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java
Hi,
2008/12/11 <og...@apache.org>:
> Author: ogusakov
> Date: Wed Dec 10 23:23:19 2008
> New Revision: 725604
>
> URL: http://svn.apache.org/viewvc?rev=725604&view=rev
> Log:
> Thanks to Ben - fixed MERCURY-40
Not a big deal but could you follow our conventions about commit message [1]?
Thanks
Vincent
[1] http://maven.apache.org/developers/conventions/svn.html
> Modified:
> maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
> maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java
>
> Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
> URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java?rev=725604&r1=725603&r2=725604&view=diff
> ==============================================================================
> --- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java (original)
> +++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java Wed Dec 10 23:23:19 2008
> @@ -24,6 +24,7 @@
> import java.util.Collections;
> import java.util.Comparator;
> import java.util.HashMap;
> +import java.util.LinkedHashMap;
> import java.util.List;
> import java.util.Map;
>
> @@ -143,7 +144,8 @@
> throw new SatException( "cannot apply policies to a null tree" );
>
> // TODO og: assumption - around 128 GA's per tree. If more - map reallocates - slow down.
> - Map<String, List<MetadataTreeNode>> buckets = new HashMap<String, List<MetadataTreeNode>>(128);
> + // TODO og: MERCURY-40
> + Map<String, List<MetadataTreeNode>> buckets = new LinkedHashMap<String, List<MetadataTreeNode>>(128);
> fillBuckets( buckets, _root );
> sortBuckets( buckets, comparators );
> useBuckets( buckets );
> @@ -419,7 +421,8 @@
> if( children == null || children.size() < 1 )
> throw new SatException("there are queries, but not results. Queries: "+queries);
>
> - Map<ArtifactBasicMetadata, List<MetadataTreeNode>> res = new HashMap<ArtifactBasicMetadata, List<MetadataTreeNode>>( queries.size() );
> + // TODO og: MERCURY-40
> + Map<ArtifactBasicMetadata, List<MetadataTreeNode>> res = new LinkedHashMap<ArtifactBasicMetadata, List<MetadataTreeNode>>( queries.size() );
> for( ArtifactBasicMetadata q : queries )
> {
> List<MetadataTreeNode> bucket = new ArrayList<MetadataTreeNode>(4);
>
> Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java
> URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java?rev=725604&r1=725603&r2=725604&view=diff
> ==============================================================================
> --- maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java (original)
> +++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java Wed Dec 10 23:23:19 2008
> @@ -342,8 +342,8 @@
> assertEquals( 3, res.size() );
>
> assertTrue( res.contains( a1 ) );
> - assertTrue( res.contains( b2 ) );
> - assertTrue( res.contains( c1 ) );
> + assertTrue( res.contains( b1 ) );
> + assertTrue( res.contains( c2 ) );
> }
> //----------------------------------------------------------------------
> // b:b:1 - c:c:[2,4)
> @@ -419,8 +419,8 @@
> assertEquals( 3, res.size() );
>
> assertTrue( res.contains( a1 ) );
> - assertTrue( res.contains( b2 ) );
> - assertTrue( res.contains( c1 ) );
> + assertTrue( res.contains( b1 ) );
> + assertTrue( res.contains( c2 ) );
> }
> //----------------------------------------------------------------------
> // d:d:1 - c:c:[2,4)
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r725604 - in /maven/mercury/trunk/mercury-md/mercury-md-sat/src:
main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java
Posted by Oleg Gusakov <ol...@gmail.com>.
Vincent Siveton wrote:
> Hi,
>
> 2008/12/11 <og...@apache.org>:
>
>> Author: ogusakov
>> Date: Wed Dec 10 23:23:19 2008
>> New Revision: 725604
>>
>> URL: http://svn.apache.org/viewvc?rev=725604&view=rev
>> Log:
>> Thanks to Ben - fixed MERCURY-40
>>
>
> Not a big deal but could you follow our conventions about commit message [1]?
>
My bad. Thanks for pointing to the document!
Oleg
> Thanks
>
> Vincent
>
> [1] http://maven.apache.org/developers/conventions/svn.html
>