From 219eef7bbdeb01a7197d34be85bf1b23726fa049 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Wed, 2 Jan 2019 22:14:15 +0300
Subject: [PATCH] [vcs-log] speedup getting heads matched by branch filter by
 looking only on branches in visible roots

---
 .../vcs/log/visible/VcsLogFiltererImpl.kt     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt
index 18a1278496bf..f85fd8aa0901 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt
@@ -20,7 +20,7 @@ import com.intellij.vcs.log.visible.filters.VcsLogFilterObject
 import com.intellij.vcs.log.visible.filters.VcsLogFilterObject.fromHashes
 import com.intellij.vcs.log.visible.filters.with
 import com.intellij.vcs.log.visible.filters.without
-import java.util.*
+import java.util.stream.Collectors
 
 class VcsLogFiltererImpl(private val logProviders: Map<VirtualFile, VcsLogProvider>,
                          private val storage: VcsLogStorage,
@@ -209,21 +209,17 @@ class VcsLogFiltererImpl(private val logProviders: Map<VirtualFile, VcsLogProvid
         return getMatchingHeads(roots, revisionFilter)
       }
 
-      val filteredByFile = getMatchingHeads(refs, roots)
-      val filteredByBranch = getMatchingHeads(refs, branchFilter)
-      return HashSet(ContainerUtil.union(ContainerUtil.intersection(filteredByBranch, filteredByFile),
-                                         getMatchingHeads(roots, revisionFilter)))
+      return ContainerUtil.union(getMatchingHeads(refs, roots, branchFilter), getMatchingHeads(roots, revisionFilter))
     }
 
-    val filteredByFile = getMatchingHeads(refs, roots)
-    if (branchFilter == null) return filteredByFile
-
-    val filteredByBranch = getMatchingHeads(refs, branchFilter)
-    return HashSet(ContainerUtil.intersection(filteredByBranch, filteredByFile))
+    if (branchFilter == null) return getMatchingHeads(refs, roots)
+    return getMatchingHeads(refs, roots, branchFilter)
   }
 
-  private fun getMatchingHeads(refs: VcsLogRefs, filter: VcsLogBranchFilter): Set<Int> {
-    return refs.branches.filter { filter.matches(it.name) }.toReferencedCommitIndexes()
+  private fun getMatchingHeads(refsModel: RefsModel, roots: Collection<VirtualFile>, filter: VcsLogBranchFilter): Set<Int> {
+    return mapRefsForRoots(refsModel, roots) { refs ->
+      refs.streamBranches().filter { filter.matches(it.name) }.collect(Collectors.toList())
+    }.toReferencedCommitIndexes()
   }
 
   private fun getMatchingHeads(roots: Collection<VirtualFile>, filter: VcsLogRevisionFilter): Set<Int> {
@@ -231,9 +227,12 @@ class VcsLogFiltererImpl(private val logProviders: Map<VirtualFile, VcsLogProvid
   }
 
   private fun getMatchingHeads(refsModel: RefsModel, roots: Collection<VirtualFile>): Set<Int> {
-    return refsModel.allRefsByRoot.filterKeys { roots.contains(it) }.values.flatMapTo(mutableSetOf()) { refs -> refs.commits }
+    return mapRefsForRoots(refsModel, roots) { refs -> refs.commits }
   }
 
+  private fun <T> mapRefsForRoots(refsModel: RefsModel, roots: Collection<VirtualFile>, mapping: (CompressedRefs) -> Iterable<T>) =
+    refsModel.allRefsByRoot.filterKeys { roots.contains(it) }.values.flatMapTo(mutableSetOf(), mapping)
+
   private fun filterDetailsInMemory(permanentGraph: PermanentGraph<Int>,
                                     detailsFilters: List<VcsLogDetailsFilter>,
                                     matchingHeads: Set<Int>?): Collection<CommitId> {