azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use File.canonicalPath in incremental caches

Browse Source 
This fix improves performance of incremental compilation on Windows
machines.
When portable JPS caches are used, DirtyFilesHolder.getRemovedFiles
could return file names which are not allowed on current platform.
Previously it resulted in IOException on File.getCanonicalFile.
#KT-53735 Fixed
This commit is contained in:
Andrey Uskov
2022-10-18 00:47:42 +03:00
committed by teamcity
parent 9c1de4be9a
commit 3832c6a520
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/storage/FileToPathConverter.kt
+2 -2
View File
@@ -18,8 +18,8 @@ fun FileToPathConverter.toPaths(files: Collection<File>): List<String> =
fun FileToPathConverter.toFiles(paths: Collection<String>): List<File> = fun FileToPathConverter.toFiles(paths: Collection<String>): List<File> =
paths.map { toFile(it) } paths.map { toFile(it) }
object FileToCanonicalPathConverter : FileToPathConverter { object FileToAbsolutePathConverter : FileToPathConverter {
override fun toPath(file: File): String = file.canonicalPath override fun toPath(file: File): String = file.normalize().absolutePath
override fun toFile(path: String): File = File(path) override fun toFile(path: String): File = File(path)
} }
build-common/src/org/jetbrains/kotlin/incremental/storage/RelativeFileToPathConverter.kt
+2 -2
View File
@@ -8,10 +8,10 @@ package org.jetbrains.kotlin.incremental.storage
import java.io.File import java.io.File
open class RelativeFileToPathConverter(baseDirFile: File?) : FileToPathConverter { open class RelativeFileToPathConverter(baseDirFile: File?) : FileToPathConverter {
private val baseDirPath = baseDirFile?.canonicalFile?.invariantSeparatorsPath private val baseDirPath = baseDirFile?.normalize()?.invariantSeparatorsPath
override fun toPath(file: File): String { override fun toPath(file: File): String {
val path = file.canonicalFile.invariantSeparatorsPath val path = file.normalize().invariantSeparatorsPath
return when { return when {
baseDirPath != null && path.startsWith(baseDirPath) -> baseDirPath != null && path.startsWith(baseDirPath) ->
PROJECT_DIR_PLACEHOLDER + path.substring(baseDirPath.length) PROJECT_DIR_PLACEHOLDER + path.substring(baseDirPath.length)
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputer.kt
+2 -2
View File
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.incremental.*
import org.jetbrains.kotlin.incremental.classpathDiff.BreadthFirstSearch.findReachableNodes import org.jetbrains.kotlin.incremental.classpathDiff.BreadthFirstSearch.findReachableNodes
import org.jetbrains.kotlin.incremental.classpathDiff.ClasspathSnapshotShrinker.shrinkClasspath import org.jetbrains.kotlin.incremental.classpathDiff.ClasspathSnapshotShrinker.shrinkClasspath
import org.jetbrains.kotlin.incremental.classpathDiff.ImpactedSymbolsComputer.computeImpactedSymbols import org.jetbrains.kotlin.incremental.classpathDiff.ImpactedSymbolsComputer.computeImpactedSymbols
import org.jetbrains.kotlin.incremental.storage.FileToCanonicalPathConverter import org.jetbrains.kotlin.incremental.storage.FileToAbsolutePathConverter
import org.jetbrains.kotlin.incremental.storage.ListExternalizer import org.jetbrains.kotlin.incremental.storage.ListExternalizer
import org.jetbrains.kotlin.incremental.storage.loadFromFile import org.jetbrains.kotlin.incremental.storage.loadFromFile
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
@@ -203,7 +203,7 @@ object ClasspathChangesComputer {
): ProgramSymbolSet { ): ProgramSymbolSet {
val workingDir = val workingDir =
FileUtil.createTempDirectory(this::class.java.simpleName, "_WorkingDir_${UUID.randomUUID()}", /* deleteOnExit */ true) FileUtil.createTempDirectory(this::class.java.simpleName, "_WorkingDir_${UUID.randomUUID()}", /* deleteOnExit */ true)
val incrementalJvmCache = IncrementalJvmCache(workingDir, /* targetOutputDir */ null, FileToCanonicalPathConverter) val incrementalJvmCache = IncrementalJvmCache(workingDir, /* targetOutputDir */ null, FileToAbsolutePathConverter)
// Step 1: // Step 1:
// - Add previous class snapshots to incrementalJvmCache. // - Add previous class snapshots to incrementalJvmCache.