forked from allegro/axion-release-plugin
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve performance of currentVersion by caching
Backport of allegro#346 to 1.10.3 version.
- Loading branch information
Jozef Vilcek
committed
Aug 30, 2020
1 parent
f1a15bc
commit 9c6acf9
Showing
7 changed files
with
196 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
src/main/groovy/pl/allegro/tech/build/axion/release/infrastructure/git/ScmCache.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| package pl.allegro.tech.build.axion.release.infrastructure.git; | ||
|
|
||
| import groovy.lang.Tuple2; | ||
| import org.eclipse.jgit.api.Git; | ||
| import org.eclipse.jgit.api.errors.GitAPIException; | ||
| import org.eclipse.jgit.lib.Ref; | ||
| import org.eclipse.jgit.revwalk.RevCommit; | ||
| import org.eclipse.jgit.revwalk.RevWalk; | ||
| import pl.allegro.tech.build.axion.release.domain.scm.ScmException; | ||
| import pl.allegro.tech.build.axion.release.domain.scm.ScmRepository; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Provides cached version for some operations on {@link ScmRepository} | ||
| */ | ||
| public class ScmCache { | ||
|
|
||
| /** | ||
| * Since this cache is statis and Gradle Demon might keep JVM process in background for a long | ||
| * time, we have to put some TTL for cached values. | ||
| */ | ||
| private static final long INVALIDATE_AFTER_MILLIS = 1000 * 60; | ||
|
|
||
| private static final ScmCache CACHE = new ScmCache(); | ||
|
|
||
| public static ScmCache getInstance() { | ||
| return CACHE; | ||
| } | ||
|
|
||
| private ScmCache() { } | ||
|
|
||
| private final Map<String, CachedState> cache = new HashMap<>(); | ||
|
|
||
| synchronized void invalidate(ScmRepository repository) { | ||
| cache.remove(repository.id()); | ||
| } | ||
|
|
||
| public synchronized boolean checkUncommittedChanges(ScmRepository repository) { | ||
| CachedState state = retrieveCachedStateFor(repository); | ||
| if (state.hasUncommittedChanges == null) { | ||
| state.hasUncommittedChanges = repository.checkUncommittedChanges(); | ||
| } | ||
| return state.hasUncommittedChanges; | ||
| } | ||
|
|
||
| synchronized List<Tuple2<Ref, RevCommit>> parsedTagList(ScmRepository repository, Git git, RevWalk walker) throws GitAPIException { | ||
| CachedState state = retrieveCachedStateFor(repository); | ||
| if (state.tags == null) { | ||
| List<Tuple2<Ref, RevCommit>> list = new ArrayList<>(); | ||
| for (Ref tag : git.tagList().call()) { | ||
| try { | ||
| list.add(new Tuple2<>(tag, walker.parseCommit(tag.getObjectId()))); | ||
| } catch (IOException e) { | ||
| throw new ScmException(e); | ||
| } | ||
| } | ||
| state.tags = list; | ||
| } | ||
| return state.tags; | ||
| } | ||
|
|
||
| private CachedState retrieveCachedStateFor(ScmRepository scmRepository) { | ||
| String key = scmRepository.id(); | ||
| String currentHeadRevision = scmRepository.currentPosition().getRevision(); | ||
| long currentTime = System.currentTimeMillis(); | ||
| CachedState state = cache.get(key); | ||
| if (state == null) { | ||
| state = new CachedState(currentHeadRevision); | ||
| cache.put(key, state); | ||
| } else { | ||
| if (!currentHeadRevision.equals(state.headRevision) || (state.createTimestamp + INVALIDATE_AFTER_MILLIS) < currentTime) { | ||
| state = new CachedState(currentHeadRevision); | ||
| cache.put(key, state); | ||
| } | ||
| } | ||
| return state; | ||
| } | ||
|
|
||
| /** | ||
| * Helper object holding cached values per SCM repository | ||
| */ | ||
| private static class CachedState { | ||
|
|
||
| final long createTimestamp; | ||
|
|
||
| /** | ||
| * HEAD revision of repo for which this cache was created. Cache has to be invalidated | ||
| * if HEAD changes. | ||
| */ | ||
| final String headRevision; | ||
|
|
||
| Boolean hasUncommittedChanges; | ||
|
|
||
| List<Tuple2<Ref, RevCommit>> tags; | ||
|
|
||
| CachedState(String headRevision) { | ||
| createTimestamp = System.currentTimeMillis(); | ||
| this.headRevision = headRevision; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters