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

[vcs-log] speed up hash filter for full hashes

Browse Source 
Instead of searching by a string, create a Hash instance and do a direct check.
This commit is contained in:
Julia Beliaeva
2018-08-20 18:17:13 +03:00
parent 8691822957
commit 041dacd169
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.java
+16 -4
View File
@@ -31,6 +31,7 @@ import com.intellij.vcs.log.data.index.VcsLogIndex;
import com.intellij.vcs.log.graph.GraphCommit;
import com.intellij.vcs.log.graph.PermanentGraph;
import com.intellij.vcs.log.graph.VisibleGraph;
import com.intellij.vcs.log.impl.HashImpl;
import com.intellij.vcs.log.impl.VcsLogFilterCollectionImpl.VcsLogFilterCollectionBuilder;
import com.intellij.vcs.log.impl.VcsLogHashFilterImpl;
import com.intellij.vcs.log.ui.filter.VcsLogTextFilterImpl;
@@ -186,10 +187,21 @@ public class VcsLogFiltererImpl implements VcsLogFilterer {
@NotNull Collection<String> hashes,
@NotNull PermanentGraph.SortType sortType,
@NotNull CommitCountStage commitCount) {
Set<Integer> hashFilterResult = ContainerUtil.map2SetNotNull(hashes, partOfHash -> {
CommitId commitId = myStorage.findCommitId(new CommitIdByStringCondition(partOfHash));
return commitId != null ? myStorage.getCommitIndex(commitId.getHash(), commitId.getRoot()) : null;
});
Set<Integer> hashFilterResult = ContainerUtil.newHashSet();
for (String partOfHash : hashes) {
if (partOfHash.length() == VcsLogUtil.FULL_HASH_LENGTH) {
Hash hash = HashImpl.build(partOfHash);
for (VirtualFile root : dataPack.getLogProviders().keySet()) {
if (myStorage.containsCommit(new CommitId(hash, root))) {
hashFilterResult.add(myStorage.getCommitIndex(hash, root));
}
}
}
else {
CommitId commitId = myStorage.findCommitId(new CommitIdByStringCondition(partOfHash));
if (commitId != null) hashFilterResult.add(myStorage.getCommitIndex(commitId.getHash(), commitId.getRoot()));
}
}
VcsLogTextFilterImpl textFilter = new VcsLogTextFilterImpl(StringUtil.join(hashes, "|"), true, false);
FilterByDetailsResult textFilterResult = filterByDetails(dataPack, new VcsLogFilterCollectionBuilder(textFilter).build(),
commitCount, dataPack.getLogProviders().keySet(), null);