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] WIP use soft ids index for updating composite persistent ids in replaceBySource

Browse Source 
GitOrigin-RevId: cb7c285bf11624ce6117622cd5356a70ac59b9a6
This commit is contained in:
Alex Plate
2020-06-02 21:27:47 +03:00
committed by intellij-monorepo-bot
parent e74169b9a7
commit 26c35fc2e4
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/workspaceModel/storage/src/com/intellij/workspaceModel/storage/impl/WorkspaceEntityStorageImpl.kt
+10 -12
View File
@@ -5,9 +5,9 @@ import com.google.common.collect.ArrayListMultimap
import com.google.common.collect.HashBiMap
import com.intellij.openapi.diagnostic.debug
import com.intellij.openapi.diagnostic.logger
import com.intellij.workspaceModel.storage.*
import com.intellij.workspaceModel.storage.impl.external.ExternalEntityIndex
import com.intellij.workspaceModel.storage.impl.external.ExternalEntityIndex.MutableExternalEntityIndex
import com.intellij.workspaceModel.storage.*
import kotlin.reflect.KClass
import kotlin.reflect.KProperty1
@@ -287,8 +287,6 @@ internal class WorkspaceEntityStorageBuilderImpl(
}
}
val softReferencesToUpdate = ArrayList<Pair<PersistentEntityId<*>, WorkspaceEntityData<*>>>()
LOG.debug { "2) Traverse entities of replaceWith store" }
// 2) Traverse entities of the enemy
// and trying to detect whenever the entity already present in the local builder or not.
@@ -318,8 +316,10 @@ internal class WorkspaceEntityStorageBuilderImpl(
val parents = this.refs.getParentRefsOfChild(pid)
val children = this.refs.getChildrenRefsOfParentBy(pid)
softReferencesToUpdate.add(Pair(persistentIdBefore, clonedEntity))
indexes.updateIndices(oldPid, pid, replaceWith)
updatePersistentIdIndexes(clonedEntity.createEntity(this), persistentIdBefore, clonedEntity)
replaceWith.indexes.virtualFileIndex.getVirtualFiles(oldPid)?.forEach { this.indexes.virtualFileIndex.index(pid, listOf(it)) }
replaceWith.indexes.entitySourceIndex.getEntryById(oldPid)?.also { this.indexes.entitySourceIndex.index(pid, it) }
updateChangeLog { it.add(ChangeEntry.ReplaceEntity(clonedEntity, children, parents)) }
}
// Remove added entity
@@ -331,8 +331,12 @@ internal class WorkspaceEntityStorageBuilderImpl(
val newEntity = this.entitiesByType.cloneAndAdd(matchedEntityData as WorkspaceEntityData<WorkspaceEntity>, entityClass)
val newPid = newEntity.createPid()
replaceMap[newPid] = oldPid
indexes.updateIndices(oldPid, newPid, replaceWith)
replaceWith.indexes.virtualFileIndex.getVirtualFiles(oldPid)?.forEach { this.indexes.virtualFileIndex.index(newPid, listOf(it)) }
replaceWith.indexes.entitySourceIndex.getEntryById(oldPid)?.also { this.indexes.entitySourceIndex.index(newPid, it) }
replaceWith.indexes.persistentIdIndex.getEntryById(oldPid)?.also { this.indexes.persistentIdIndex.index(newPid, it) }
if (newEntity is SoftLinkable) indexes.updateSoftLinksIndex(newEntity)
createAddEvent(newEntity)
}
}
@@ -438,12 +442,6 @@ internal class WorkspaceEntityStorageBuilderImpl(
}
}
LOG.debug { "6) Update soft links index" }
// This index should be updated after all operations because some persistentIds use referred entities during calculating
softReferencesToUpdate.forEach {
indexes.updateSoftReferences(it.first, it.second, this)
}
// Assert consistency
this.assertConsistencyInStrictMode()