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

Remove old IC: remove experimental cache version

Browse Source 
Original commit: 534db2d45b
This commit is contained in:
Alexey Tsvetkov
2017-05-02 19:39:32 +03:00
parent 33c6d52643
commit 380d3563eb
14 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
-1
View File
@@ -82,7 +82,6 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest()
val jvmMetaBuildInfo = jvmBuildMetaInfoFile(target, dataManager)
dumpCachesForTarget(p, paths, target,
versions.normalVersion(target).formatVersionFile,
versions.experimentalVersion(target).formatVersionFile,
jvmMetaBuildInfo,
subdirectory = KOTLIN_CACHE_DIRECTORY_NAME)
}
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt
-2
View File
@@ -23,8 +23,6 @@ import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider
abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest()
abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() {
override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable<ModuleBuildTarget>) =
targets.map { cacheVersionProvider.experimentalVersion(it) }
}
abstract class AbstractDataContainerVersionChangedTest : AbstractExperimentalIncrementalCacheVersionChangedTest() {
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
-7
View File
@@ -370,13 +370,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
dataManager.getKotlinCache(target).clean()
}
}
CacheVersion.Action.CLEAN_EXPERIMENTAL_CACHES -> {
LOG.info("Clearing experimental caches for all targets")
for (target in allTargets) {
dataManager.getKotlinCache(target).cleanExperimental()
}
}
CacheVersion.Action.CLEAN_DATA_CONTAINER -> {
LOG.info("Clearing lookup cache")
dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider).clean()
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt
-4
View File
@@ -21,7 +21,6 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.kotlin.incremental.CacheVersion
import org.jetbrains.kotlin.incremental.dataContainerCacheVersion
import org.jetbrains.kotlin.incremental.experimentalCacheVersion
import org.jetbrains.kotlin.incremental.normalCacheVersion
import java.io.File
@@ -32,8 +31,6 @@ class CacheVersionProvider(private val paths: BuildDataPaths) {
fun normalVersion(target: ModuleBuildTarget): CacheVersion = normalCacheVersion(target.dataRoot)
fun experimentalVersion(target: ModuleBuildTarget): CacheVersion = experimentalCacheVersion(target.dataRoot)
fun dataContainerVersion(): CacheVersion = dataContainerCacheVersion(KotlinDataContainerTarget.dataRoot)
fun allVersions(targets: Iterable<ModuleBuildTarget>): Iterable<CacheVersion> {
@@ -42,7 +39,6 @@ class CacheVersionProvider(private val paths: BuildDataPaths) {
for (dataRoot in targets.map { it.dataRoot }) {
versions.add(normalCacheVersion(dataRoot))
versions.add(experimentalCacheVersion(dataRoot))
}
return versions
jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log
+1 -1
View File
@@ -1,7 +1,7 @@
================ Step #1 =================
Building module1
Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_EXPERIMENTAL_CACHES, CLEAN_DATA_CONTAINER]
Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_DATA_CONTAINER]
Exit code: NOTHING_DONE
------------------------------------------
Building module2
jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log
+1 -1
View File
@@ -1,7 +1,7 @@
================ Step #1 =================
Building module1
Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_EXPERIMENTAL_CACHES, CLEAN_DATA_CONTAINER]
Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_DATA_CONTAINER]
Exit code: NOTHING_DONE
------------------------------------------
Building module2
jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt
-4
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module1' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
@@ -14,7 +13,6 @@ Module 'module1' production
source-to-classes.tab
Module 'module1' tests
Module 'module2' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
inline-functions.tab
@@ -24,7 +22,6 @@ Module 'module2' production
source-to-classes.tab
Module 'module2' tests
Module 'module3' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
@@ -33,7 +30,6 @@ Module 'module3' production
source-to-classes.tab
Module 'module3' tests
Module 'module4' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt
-1
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt
-1
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt
-1
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
constants.tab
jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt
-1
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
internal-name-to-source.tab
jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt
-1
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
inline-functions.tab
jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt
-1
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
inline-functions.tab
jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt
-1
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
internal-name-to-source.tab