MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] IDEA-132552 Use THashSet instead of HashSet for VcsRefs to save some memory

Browse Source
This commit is contained in:
Kirill Likhodedov
2014-11-07 16:21:10 +03:00
parent 741f03209c
commit ad6c010beb
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/log/GitLogProvider.java
+20 -8
View File
@@ -39,6 +39,7 @@ import git4idea.history.GitHistoryUtils;
import git4idea.repo.GitRepository;
import git4idea.repo.GitRepositoryChangeListener;
import git4idea.repo.GitRepositoryManager;
import gnu.trove.THashSet;
import gnu.trove.TObjectHashingStrategy;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -121,10 +122,10 @@ public class GitLogProvider implements VcsLogProvider {
currentTagNames = readCurrentTagNames(root);
addOldStillExistingTags(allRefs, currentTagNames, rex.getPreviousRefs());
allDetails = ContainerUtil.newHashSet(data.getCommits());
allDetails = newHashSet(data.getCommits());
Set<String> previousTags = new HashSet<String>(ContainerUtil.mapNotNull(rex.getPreviousRefs(), GET_TAG_NAME));
Set<String> safeTags = new HashSet<String>(ContainerUtil.mapNotNull(safeRefs, GET_TAG_NAME));
Set<String> previousTags = newHashSet(ContainerUtil.mapNotNull(rex.getPreviousRefs(), GET_TAG_NAME));
Set<String> safeTags = newHashSet(ContainerUtil.mapNotNull(safeRefs, GET_TAG_NAME));
Set<String> newUnmatchedTags = remove(currentTagNames, previousTags, safeTags);
if (!newUnmatchedTags.isEmpty()) {
@@ -263,14 +264,14 @@ public class GitLogProvider implements VcsLogProvider {
@NotNull
private Set<String> readCurrentTagNames(@NotNull VirtualFile root) throws VcsException {
Set<String> tags = ContainerUtil.newHashSet();
Set<String> tags = newHashSet();
GitTag.listAsStrings(myProject, root, tags, null);
return tags;
}
@NotNull
private static <T> Set<T> remove(@NotNull Set<T> original, @NotNull Set<T>... toRemove) {
Set<T> result = ContainerUtil.newHashSet(original);
Set<T> result = newHashSet(original);
for (Set<T> set : toRemove) {
result.removeAll(set);
}
@@ -305,8 +306,8 @@ public class GitLogProvider implements VcsLogProvider {
parameters.add("--sparse");
final GitBekParentFixer parentFixer = GitBekParentFixer.prepare(root, this);
Set<VcsUser> userRegistry = ContainerUtil.newHashSet();
Set<VcsRef> refs = ContainerUtil.newHashSet();
Set<VcsUser> userRegistry = newHashSet();
Set<VcsRef> refs = newHashSet();
GitHistoryUtils.readCommits(myProject, root, parameters, new CollectConsumer<VcsUser>(userRegistry),
new CollectConsumer<VcsRef>(refs), new Consumer<TimedVcsCommit>() {
@Override
@@ -339,7 +340,7 @@ public class GitLogProvider implements VcsLogProvider {
VirtualFile root = repository.getRoot();
Collection<GitLocalBranch> localBranches = repository.getBranches().getLocalBranches();
Collection<GitRemoteBranch> remoteBranches = repository.getBranches().getRemoteBranches();
Set<VcsRef> refs = new HashSet<VcsRef>(localBranches.size() + remoteBranches.size());
Set<VcsRef> refs = new THashSet<VcsRef>(localBranches.size() + remoteBranches.size());
for (GitLocalBranch localBranch : localBranches) {
refs.add(
myVcsObjectsFactory.createRef(HashImpl.build(localBranch.getHash()), localBranch.getName(), GitRefManager.LOCAL_BRANCH, root));
@@ -495,4 +496,15 @@ public class GitLogProvider implements VcsLogProvider {
}
return true;
}
@NotNull
private static <T> Set<T> newHashSet() {
return new THashSet<T>();
}
@NotNull
private static <T> Set<T> newHashSet(@NotNull Collection<T> initialCollection) {
return new THashSet<T>(initialCollection);
}
}