summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/gitblit/utils')
-rw-r--r--src/main/java/com/gitblit/utils/ActivityUtils.java17
-rw-r--r--src/main/java/com/gitblit/utils/CommitCache.java253
-rw-r--r--src/main/java/com/gitblit/utils/ObjectCache.java2
-rw-r--r--src/main/java/com/gitblit/utils/RefLogUtils.java14
4 files changed, 266 insertions, 20 deletions
diff --git a/src/main/java/com/gitblit/utils/ActivityUtils.java b/src/main/java/com/gitblit/utils/ActivityUtils.java
index edeb01ad..fa74350e 100644
--- a/src/main/java/com/gitblit/utils/ActivityUtils.java
+++ b/src/main/java/com/gitblit/utils/ActivityUtils.java
@@ -32,9 +32,7 @@ import java.util.TimeZone;
import java.util.TreeSet;
import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
@@ -112,22 +110,19 @@ public class ActivityUtils {
} else {
branches.add(objectId);
}
- Map<ObjectId, List<RefModel>> allRefs = JGitUtils
- .getAllRefs(repository, model.showRemoteBranches);
for (String branch : branches) {
String shortName = branch;
if (shortName.startsWith(Constants.R_HEADS)) {
shortName = shortName.substring(Constants.R_HEADS.length());
}
- List<RevCommit> commits = JGitUtils.getRevLog(repository,
- branch, thresholdDate);
+ List<RepositoryCommit> commits = CommitCache.instance().getCommits(model.name, repository, branch, thresholdDate);
if (model.maxActivityCommits > 0 && commits.size() > model.maxActivityCommits) {
// trim commits to maximum count
commits = commits.subList(0, model.maxActivityCommits);
}
- for (RevCommit commit : commits) {
- Date date = JGitUtils.getCommitDate(commit);
+ for (RepositoryCommit commit : commits) {
+ Date date = commit.getCommitDate();
String dateStr = df.format(date);
if (!activity.containsKey(dateStr)) {
// Normalize the date to midnight
@@ -140,11 +135,7 @@ public class ActivityUtils {
a.excludeAuthors(authorExclusions);
activity.put(dateStr, a);
}
- RepositoryCommit commitModel = activity.get(dateStr)
- .addCommit(model.name, shortName, commit);
- if (commitModel != null) {
- commitModel.setRefs(allRefs.get(commit.getId()));
- }
+ activity.get(dateStr).addCommit(commit);
}
}
diff --git a/src/main/java/com/gitblit/utils/CommitCache.java b/src/main/java/com/gitblit/utils/CommitCache.java
new file mode 100644
index 00000000..e188ff9a
--- /dev/null
+++ b/src/main/java/com/gitblit/utils/CommitCache.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2013 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.utils;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.gitblit.models.RefModel;
+import com.gitblit.models.RepositoryCommit;
+
+/**
+ * Caches repository commits for re-use in the dashboard and activity pages.
+ *
+ * @author James Moger
+ *
+ */
+public class CommitCache {
+
+ private static final CommitCache instance;
+
+ protected final Logger logger = LoggerFactory.getLogger(getClass());
+
+ protected final Map<String, ObjectCache<List<RepositoryCommit>>> cache;
+
+ protected int cacheDays = -1;
+
+ public static CommitCache instance() {
+ return instance;
+ }
+
+ static {
+ instance = new CommitCache();
+ }
+
+ protected CommitCache() {
+ cache = new ConcurrentHashMap<String, ObjectCache<List<RepositoryCommit>>>();
+ }
+
+ /**
+ * Returns the cutoff date for the cache. Commits after this date are cached.
+ * Commits before this date are not cached.
+ *
+ * @return
+ */
+ protected Date getCacheCutoffDate() {
+ final Calendar cal = Calendar.getInstance();
+ cal.setTimeInMillis(System.currentTimeMillis());
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ cal.add(Calendar.DATE, -1*cacheDays);
+ return cal.getTime();
+ }
+
+ /**
+ * Sets the number of days to cache.
+ *
+ * @param days
+ */
+ public synchronized void setCacheDays(int days) {
+ this.cacheDays = days;
+ clear();
+ }
+
+ /**
+ * Clears the entire commit cache.
+ *
+ */
+ public void clear() {
+ cache.clear();
+ }
+
+ /**
+ * Clears the commit cache for a specific repository.
+ *
+ * @param repositoryName
+ */
+ public void clear(String repositoryName) {
+ String repoKey = repositoryName.toLowerCase();
+ ObjectCache<List<RepositoryCommit>> repoCache = cache.remove(repoKey);
+ if (repoCache != null) {
+ logger.info(MessageFormat.format("{0} commit cache cleared", repositoryName));
+ }
+ }
+
+ /**
+ * Get all commits for the specified repository:branch that are in the cache.
+ *
+ * @param repositoryName
+ * @param repository
+ * @param branch
+ * @return a list of commits
+ */
+ public List<RepositoryCommit> getCommits(String repositoryName, Repository repository, String branch) {
+ return getCommits(repositoryName, repository, branch, getCacheCutoffDate());
+ }
+
+ /**
+ * Get all commits for the specified repository:branch since a specific date.
+ * These commits may be retrieved from the cache if the sinceDate is after
+ * the cacheCutoffDate.
+ *
+ * @param repositoryName
+ * @param repository
+ * @param branch
+ * @param sinceDate
+ * @return a list of commits
+ */
+ public List<RepositoryCommit> getCommits(String repositoryName, Repository repository, String branch, Date sinceDate) {
+ long start = System.nanoTime();
+ Date cacheCutoffDate = getCacheCutoffDate();
+ List<RepositoryCommit> list;
+ if (cacheDays > 0 && (sinceDate.getTime() >= cacheCutoffDate.getTime())) {
+ // request fits within the cache window
+ String repoKey = repositoryName.toLowerCase();
+ if (!cache.containsKey(repoKey)) {
+ cache.put(repoKey, new ObjectCache<List<RepositoryCommit>>());
+ }
+
+ ObjectCache<List<RepositoryCommit>> repoCache = cache.get(repoKey);
+ String branchKey = branch.toLowerCase();
+
+ RevCommit tip = JGitUtils.getCommit(repository, branch);
+ Date tipDate = JGitUtils.getCommitDate(tip);
+
+ List<RepositoryCommit> commits;
+ if (!repoCache.hasCurrent(branchKey, tipDate)) {
+ commits = repoCache.getObject(branchKey);
+ if (ArrayUtils.isEmpty(commits)) {
+ // we don't have any cached commits for this branch, reload
+ commits = get(repositoryName, repository, branch, cacheCutoffDate);
+ repoCache.updateObject(branchKey, tipDate, commits);
+ logger.debug(MessageFormat.format("parsed {0} commits from {1}:{2} since {3,date,yyyy-MM-dd} in {4} msecs",
+ commits.size(), repositoryName, branch, cacheCutoffDate, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)));
+ } else {
+ // incrementally update cache since the last cached commit
+ ObjectId sinceCommit = commits.get(0).getId();
+ List<RepositoryCommit> incremental = get(repositoryName, repository, branch, sinceCommit);
+ logger.info(MessageFormat.format("incrementally added {0} commits to cache for {1}:{2} in {3} msecs",
+ incremental.size(), repositoryName, branch, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)));
+ incremental.addAll(commits);
+ repoCache.updateObject(branchKey, tipDate, incremental);
+ commits = incremental;
+ }
+ } else {
+ // cache is current
+ commits = repoCache.getObject(branchKey);
+ // evict older commits outside the cache window
+ commits = reduce(commits, cacheCutoffDate);
+ // update cache
+ repoCache.updateObject(branchKey, tipDate, commits);
+ }
+
+ if (sinceDate.equals(cacheCutoffDate)) {
+ list = commits;
+ } else {
+ // reduce the commits to those since the specified date
+ list = reduce(commits, sinceDate);
+ }
+ logger.debug(MessageFormat.format("retrieved {0} commits from cache of {1}:{2} since {3,date,yyyy-MM-dd} in {4} msecs",
+ list.size(), repositoryName, branch, sinceDate, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)));
+ } else {
+ // not caching or request outside cache window
+ list = get(repositoryName, repository, branch, sinceDate);
+ logger.debug(MessageFormat.format("parsed {0} commits from {1}:{2} since {3,date,yyyy-MM-dd} in {4} msecs",
+ list.size(), repositoryName, branch, sinceDate, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)));
+ }
+ return list;
+ }
+
+ /**
+ * Returns a list of commits for the specified repository branch.
+ *
+ * @param repositoryName
+ * @param repository
+ * @param branch
+ * @param sinceDate
+ * @return a list of commits
+ */
+ protected List<RepositoryCommit> get(String repositoryName, Repository repository, String branch, Date sinceDate) {
+ Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository, false);
+ List<RepositoryCommit> commits = new ArrayList<RepositoryCommit>();
+ for (RevCommit commit : JGitUtils.getRevLog(repository, branch, sinceDate)) {
+ RepositoryCommit commitModel = new RepositoryCommit(repositoryName, branch, commit);
+ commitModel.setRefs(allRefs.get(commitModel.getName()));
+ commits.add(commitModel);
+ }
+ return commits;
+ }
+
+ /**
+ * Returns a list of commits for the specified repository branch since the specified commit.
+ *
+ * @param repositoryName
+ * @param repository
+ * @param branch
+ * @param sinceCommit
+ * @return a list of commits
+ */
+ protected List<RepositoryCommit> get(String repositoryName, Repository repository, String branch, ObjectId sinceCommit) {
+ Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository, false);
+ List<RepositoryCommit> commits = new ArrayList<RepositoryCommit>();
+ for (RevCommit commit : JGitUtils.getRevLog(repository, sinceCommit.getName(), branch)) {
+ RepositoryCommit commitModel = new RepositoryCommit(repositoryName, branch, commit);
+ commitModel.setRefs(allRefs.get(commitModel.getName()));
+ commits.add(commitModel);
+ }
+ return commits;
+ }
+
+ /**
+ * Reduces the list of commits to those since the specified date.
+ *
+ * @param commits
+ * @param sinceDate
+ * @return a list of commits
+ */
+ protected List<RepositoryCommit> reduce(List<RepositoryCommit> commits, Date sinceDate) {
+ List<RepositoryCommit> filtered = new ArrayList<RepositoryCommit>();
+ for (RepositoryCommit commit : commits) {
+ if (commit.getCommitDate().compareTo(sinceDate) >= 0) {
+ filtered.add(commit);
+ }
+ }
+ return filtered;
+ }
+}
diff --git a/src/main/java/com/gitblit/utils/ObjectCache.java b/src/main/java/com/gitblit/utils/ObjectCache.java
index 38f2e59a..692669f4 100644
--- a/src/main/java/com/gitblit/utils/ObjectCache.java
+++ b/src/main/java/com/gitblit/utils/ObjectCache.java
@@ -85,7 +85,7 @@ public class ObjectCache<X> implements Serializable {
obj.object = object;
}
- public Object remove(String name) {
+ public X remove(String name) {
if (cache.containsKey(name)) {
return cache.remove(name).object;
}
diff --git a/src/main/java/com/gitblit/utils/RefLogUtils.java b/src/main/java/com/gitblit/utils/RefLogUtils.java
index ce03a163..73b71468 100644
--- a/src/main/java/com/gitblit/utils/RefLogUtils.java
+++ b/src/main/java/com/gitblit/utils/RefLogUtils.java
@@ -549,15 +549,15 @@ public class RefLogUtils {
String linearParent = null;
for (RefModel local : JGitUtils.getLocalBranches(repository, true, -1)) {
String branch = local.getName();
- List<RevCommit> commits = JGitUtils.getRevLog(repository, branch, minimumDate);
- for (RevCommit commit : commits) {
+ List<RepositoryCommit> commits = CommitCache.instance().getCommits(repositoryName, repository, branch, minimumDate);
+ for (RepositoryCommit commit : commits) {
if (linearParent != null) {
if (!commit.getName().equals(linearParent)) {
// only follow linear branch commits
continue;
}
}
- Date date = JGitUtils.getCommitDate(commit);
+ Date date = commit.getCommitDate();
String dateStr = df.format(date);
if (!dailydigests.containsKey(dateStr)) {
dailydigests.put(dateStr, new DailyLogEntry(repositoryName, date));
@@ -571,7 +571,7 @@ public class RefLogUtils {
digest.updateRef(branch, ReceiveCommand.Type.UPDATE, linearParent, commit.getName());
}
- RepositoryCommit repoCommit = digest.addCommit(branch, commit);
+ RepositoryCommit repoCommit = digest.addCommit(commit);
if (repoCommit != null) {
List<RefModel> matchedRefs = allRefs.get(commit.getId());
repoCommit.setRefs(matchedRefs);
@@ -587,7 +587,8 @@ public class RefLogUtils {
}
RefLogEntry tagEntry = tags.get(dateStr);
tagEntry.updateRef(ref.getName(), ReceiveCommand.Type.CREATE);
- tagEntry.addCommit(ref.getName(), commit);
+ RepositoryCommit rc = repoCommit.clone(ref.getName());
+ tagEntry.addCommit(rc);
} else if (ref.getName().startsWith(Constants.R_PULL)) {
// treat pull requests as special events in the log
if (!pulls.containsKey(dateStr)) {
@@ -597,7 +598,8 @@ public class RefLogUtils {
}
RefLogEntry pullEntry = pulls.get(dateStr);
pullEntry.updateRef(ref.getName(), ReceiveCommand.Type.CREATE);
- pullEntry.addCommit(ref.getName(), commit);
+ RepositoryCommit rc = repoCommit.clone(ref.getName());
+ pullEntry.addCommit(rc);
}
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-03 00:35:10 +0000