Skip to content
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

Jump to bottom

Cache result of getBestFitRule (fixes #575) #365

Closed
wants to merge 2 commits into from
Closed

Cache result of getBestFitRule (fixes #575) #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b66a432
Add a test case to show performance issue
TobiX Mar 17, 2022
e7571bc
Cache result of getBestFitRule
TobiX Sep 2, 2019
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
2 changes: 2 additions & 0 deletions src/it/it-property-updates-report-002-slow/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
invoker.goals=site
invoker.timeoutInSeconds=30
135 changes: 135 additions & 0 deletions src/it/it-property-updates-report-002-slow/maven-version-rules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<ruleset xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
<rule groupId="commons-collections">
<ignoreVersions>
<ignoreVersion type="regex">200[34].*</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="com.fasterxml.jackson">
<ignoreVersions>
<ignoreVersion type="regex">.*[.-](rc|pr)\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations">
<ignoreVersions>
<ignoreVersion type="regex">2\.9\.\d+</ignoreVersion>
<ignoreVersion type="regex">.*[.-](rc|pr)\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="com.fasterxml.jackson.jaxrs">
<ignoreVersions>
<ignoreVersion type="regex">.*[.-](rc|pr)\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="com.hazelcast">
<ignoreVersions>
<ignoreVersion type="regex">.*-RC\d+</ignoreVersion>
<ignoreVersion type="regex">.*-EA\d*</ignoreVersion>
<ignoreVersion type="regex">.*-BETA-\d*</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="javax.validation">
<ignoreVersions>
<ignoreVersion type="regex">.*\.(Alpha|Beta|CR)\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.camunda.bpm.dmn">
<ignoreVersions>
<ignoreVersion type="regex">.*-alpha\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.codehaus.groovy">
<ignoreVersions>
<ignoreVersion type="regex">.*-(alpha|beta|rc)-\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.hibernate">
<ignoreVersions>
<ignoreVersion type="regex">.*\.(Alpha|Beta|CR)\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.javassist">
<ignoreVersions>
<ignoreVersion type="regex">.*-CR\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.jvnet.jaxb2_commons">
<ignoreVersions>
<ignoreVersion>1.11.1</ignoreVersion>
<ignoreVersion>1.11.1-PUBLISHED-BY-MISTAKE</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.mariadb.jdbc">
<ignoreVersions>
<ignoreVersion type="regex">.*-(beta-|RC)\d*</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.postgresql">
<ignoreVersions>
<ignoreVersion type="regex">.*\.jre[67]</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.slf4j">
<ignoreVersions>
<ignoreVersion type="regex">.*-alpha\d+</ignoreVersion>
<ignoreVersion type="regex">.*-beta\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="log4j">
<ignoreVersions>
<ignoreVersion type="regex">.*-atlassian-.*</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.mockito">
<ignoreVersions>
<ignoreVersion type="regex">.*-beta(\.\d+)?</ignoreVersion>
<ignoreVersion type="regex">.*-RC\.\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.thymeleaf">
<ignoreVersions>
<ignoreVersion type="regex">.*\.(ALPHA|BETA)\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.powermock">
<ignoreVersions>
<ignoreVersion type="regex">.*RC\d+</ignoreVersion>
<ignoreVersion type="regex">.*-beta\.\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="com.sun.xml.bind">
<ignoreVersions>
<ignoreVersion type="regex">.*-b\d+\.\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.glassfish.jaxb">
<ignoreVersions>
<ignoreVersion type="regex">.*-b[\d.]+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="junit">
<ignoreVersions>
<ignoreVersion type="regex">.*-beta-\d+</ignoreVersion>
<ignoreVersion type="regex">.*-rc-\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.junit.jupiter">
<ignoreVersions>
<ignoreVersion type="regex">.*-M\d+</ignoreVersion>
<ignoreVersion type="regex">.*-RC\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.junit.vintage">
<ignoreVersions>
<ignoreVersion type="regex">.*-M\d+</ignoreVersion>
<ignoreVersion type="regex">.*-RC\d+</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="org.junit.platform">
<ignoreVersions>
<ignoreVersion type="regex">.*-M\d+</ignoreVersion>
<ignoreVersion type="regex">.*-RC\d+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleset>
221 changes: 221 additions & 0 deletions src/it/it-property-updates-report-002-slow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>localhost</groupId>
<artifactId>it-property-updates-report-002-slow</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<name>property-updates-report</name>
<description>Validate performance of property-updates-report</description>

<properties>
<spring.version>3.2.17.RELEASE</spring.version>
<hibernate-validator.version>4.3.2.Final</hibernate-validator.version>
<slf4j.version>1.7.10</slf4j.version>
<jaxb.version>2.2.11</jaxb.version>
<jaxb2-basics.version>0.11.1</jaxb2-basics.version>
<junit-jupiter.version>5.5.1</junit-jupiter.version>
<poi.version>3.17</poi.version>
<httpclient.version>4.5.2</httpclient.version>
<jackson.version>2.6.7.3</jackson.version>
<mariadb-client.version>2.4.3</mariadb-client.version>
<postgresql-client.version>42.2.6</postgresql-client.version>
<groovy.version>2.0.0</groovy.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql-client.version}</version>
</dependency>

<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb-client.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-migrationsupport</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${httpclient.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>${poi.version}</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-bom</artifactId>
<version>${jaxb.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
<version>${jaxb2-basics.version}</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-testing</artifactId>
<version>${jaxb2-basics.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.7</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<reporting>
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1</version>
<reportSets>
<reportSet/>
</reportSets>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<configuration>
<rulesUri>file:/${project.basedir}/maven-version-rules.xml</rulesUri>
</configuration>
<reportSets>
<reportSet>
<reports>
<report>property-updates-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</project>
15 changes: 15 additions & 0 deletions src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,14 @@ public class DefaultVersionsHelper
*/
private final ArtifactResolver artifactResolver;

/**
* A cache mapping artifacts to their best fitting rule, since looking up
* this information can be quite costly.
*
* @since 2.11
*/
private final Map<String, Rule> artifactBestFitRule = new HashMap<>();

/**
* Constructs a new {@link DefaultVersionsHelper}.
*
Expand Down Expand Up @@ -551,6 +559,11 @@ public VersionComparator getVersionComparator( String groupId, String artifactId
*/
protected Rule getBestFitRule( String groupId, String artifactId )
{
String groupArtifactId = groupId + ':' + artifactId;
if (artifactBestFitRule.containsKey( groupArtifactId )) {
return artifactBestFitRule.get( groupArtifactId );
}

Rule bestFit = null;
final List<Rule> rules = ruleSet.getRules();
int bestGroupIdScore = Integer.MAX_VALUE;
Expand Down Expand Up @@ -600,6 +613,8 @@ protected Rule getBestFitRule( String groupId, String artifactId )
}
bestFit = rule;
}

artifactBestFitRule.put( groupArtifactId, bestFit );
return bestFit;
}

Expand Down