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

[workspace model] IDEA-265068 Speedup the search of existing FilePathNode with the same contentId

Browse Source 
To simplify the change we use `ObjectOpenCustomHashSet` with custom hashing strategy base on `FilePathNode.contentId`
It will increase memory usage from 45Mb to 49Mb for project attached to the ticket which contains 200k of objects.

GitOrigin-RevId: a80b3ce3fcd6a075115de14ad6bb439fdfedde15
This commit is contained in:
Mikhail Mazurkevich
2021-03-24 16:19:33 +00:00
committed by intellij-monorepo-bot
parent 351fb5316c
commit 9a8a6d7c15
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/workspaceModel/storage/src/com/intellij/workspaceModel/storage/impl/url/VirtualFileUrlManagerImpl.kt
+21 -6
View File
@@ -2,14 +2,15 @@
package com.intellij.workspaceModel.storage.impl.url
import com.intellij.openapi.util.io.FileUtil
import com.intellij.util.SmartList
import com.intellij.util.io.URLUtil
import com.intellij.workspaceModel.storage.impl.IntIdGenerator
import com.intellij.workspaceModel.storage.impl.VirtualFileNameStore
import com.intellij.workspaceModel.storage.url.VirtualFileUrl
import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager
import it.unimi.dsi.fastutil.Hash.Strategy
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
import it.unimi.dsi.fastutil.ints.IntArrayList
import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet
open class VirtualFileUrlManagerImpl : VirtualFileUrlManager {
private val idGenerator = IntIdGenerator()
@@ -236,12 +237,10 @@ open class VirtualFileUrlManagerImpl : VirtualFileUrlManager {
internal inner class FilePathNode(val nodeId: Int, val contentId: Int, val parent: FilePathNode? = null) {
private var virtualFileUrl: VirtualFileUrl? = null
private var children: MutableList<FilePathNode>? = null
private var children: ObjectOpenCustomHashSet<FilePathNode>? = null
fun findChild(nameId: Int): FilePathNode? {
// If search of child node will be slow, replace SmartList to THashSet
// For now SmartList reduce 500Kb memory on IDEA project
return children?.find { it.contentId == nameId }
return children?.get(FilePathNode(0, nameId))
}
fun getSubtreeNodes(): List<FilePathNode> {
@@ -276,7 +275,7 @@ open class VirtualFileUrlManagerImpl : VirtualFileUrlManager {
fun isEmpty() = children == null || children!!.isEmpty()
private fun createChildrenList() {
if (children == null) children = SmartList()
if (children == null) children = ObjectOpenCustomHashSet(HASHING_STRATEGY)
}
fun print(): String {
@@ -304,4 +303,20 @@ open class VirtualFileUrlManagerImpl : VirtualFileUrlManager {
}
}
}
private companion object {
val HASHING_STRATEGY: Strategy<FilePathNode> = object : Strategy<FilePathNode> {
override fun equals(node1: FilePathNode?, node2: FilePathNode?): Boolean {
if (node1 === node2) {
return true
}
if (node1 == null || node2 == null) {
return false
}
return node1.contentId == node2.contentId
}
override fun hashCode(node: FilePathNode?): Int = node?.contentId ?: 0
}
}
}