Skip to content

Optimize lookup time of packageFragments #5563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −7
Open

Optimize lookup time of packageFragments #5563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProviderImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,27 @@ package org.jetbrains.kotlin.descriptors
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name

class PackageFragmentProviderImpl(
private val packageFragments: Collection<PackageFragmentDescriptor>
class PackageFragmentProviderImpl private constructor(
private val packageFragmentsByFqName: HashMap<FqName, List<PackageFragmentDescriptor>>
) : PackageFragmentProviderOptimized {
constructor(packageFragments: Collection<PackageFragmentDescriptor>) : this(
packageFragmentsByFqName = packageFragments.groupBy { it.fqName } as HashMap<FqName, List<PackageFragmentDescriptor>>
)

override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) {
this.packageFragments.filterTo(packageFragments) { it.fqName == fqName }
packageFragments.addAll(packageFragmentsByFqName.getOrDefault(fqName, listOf()))
}

override fun isEmpty(fqName: FqName): Boolean =
this.packageFragments.none { it.fqName == fqName }
packageFragmentsByFqName.getOrDefault(fqName, null) != null

@Deprecated("for usages use #packageFragments(FqName) at final point, for impl use #collectPackageFragments(FqName, MutableCollection<PackageFragmentDescriptor>)")
override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> =
packageFragments.filter { it.fqName == fqName }
packageFragmentsByFqName.getOrDefault(fqName, emptyList())

override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName> =
packageFragments.asSequence()
.map { it.fqName }
packageFragmentsByFqName.values
.flatMap { collection -> collection.map { it.fqName } }
.filter { !it.isRoot && it.parent() == fqName }
.toList()
}