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

Avoid instanciating LookupStorage when clearing it

Browse Source 
#KT-22535
  #KT-22995

Original commit: 7c9412a0b3
This commit is contained in:
Alexey Tsvetkov
2018-02-22 03:33:55 +03:00
parent 1605b0c22a
commit 86bc49ba0c
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+2 -2
View File
@@ -380,7 +380,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
rebuildAfterCacheVersionChanged[target] = true rebuildAfterCacheVersionChanged[target] = true
} }
dataManager.withLookupStorage { it.clean() } dataManager.cleanLookupStorage(LOG)
return return
} }
CacheVersion.Action.REBUILD_CHUNK -> { CacheVersion.Action.REBUILD_CHUNK -> {
@@ -405,7 +405,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
} }
CacheVersion.Action.CLEAN_DATA_CONTAINER -> { CacheVersion.Action.CLEAN_DATA_CONTAINER -> {
LOG.info("Clearing lookup cache") LOG.info("Clearing lookup cache")
dataManager.withLookupStorage { it.clean() } dataManager.cleanLookupStorage(LOG)
cacheVersionsProvider.dataContainerVersion().clean() cacheVersionsProvider.dataContainerVersion().clean()
} }
else -> { else -> {
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsLookupStorage.kt
+22 -6
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.jps.incremental package org.jetbrains.kotlin.jps.incremental
import com.intellij.openapi.diagnostic.Logger
import org.jetbrains.jps.builders.storage.BuildDataCorruptedException import org.jetbrains.jps.builders.storage.BuildDataCorruptedException
import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.jps.builders.storage.StorageProvider
import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.BuildDataManager
@@ -24,13 +25,28 @@ import org.jetbrains.kotlin.incremental.LookupStorage
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
@Synchronized private object LookupStorageLock
fun BuildDataManager.cleanLookupStorage(log: Logger) {
synchronized(LookupStorageLock) {
try {
cleanTargetStorages(KotlinDataContainerTarget)
} catch (e: IOException) {
if (!dataPaths.getTargetDataRoot(KotlinDataContainerTarget).deleteRecursively()) {
log.debug("Could not clear lookup storage caches", e)
}
}
}
}
fun <T> BuildDataManager.withLookupStorage(fn: (LookupStorage) -> T): T { fun <T> BuildDataManager.withLookupStorage(fn: (LookupStorage) -> T): T {
try { synchronized(LookupStorageLock) {
val lookupStorage = getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) try {
return fn(lookupStorage) val lookupStorage = getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider)
} catch (e: IOException) { return fn(lookupStorage)
throw BuildDataCorruptedException(e) } catch (e: IOException) {
throw BuildDataCorruptedException(e)
}
} }
} }