From fe93ea21323ea8f25ce83ae9f16e0dabdaca18ee Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Mon, 15 Oct 2018 12:26:21 +0300
Subject: [PATCH] JPS: Fix updating cache format version for rebuilt targets by
 removing i/o optimization

Problem: previously, format-version.txt file was deleted while cleaning
target output on rebuild. Since directory was deleted, cache
attributesDiff stored in memory was not updated. This causes that on
saveExpectedStateIfNeeded does nothing.

The right way to fix it is move cache version format diff into
AbstractIncrementalCache, and override `clean()` method. But this is
hard to do for lookup storage, since used compilers set (jvm/js) will
known only after context init. This can be done by moving `expected`
attributes out of manager, but this is huge change for small benefit.

So, the optimal way for now is to write version for each build, even if
it is not changed.

#KT-27044 Fixed

Original commit: 5232f080d683a22c490f4f19fd946d3bebb0fc89
---
 .../src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt       | 2 +-
 .../org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt  | 4 ++--
 .../jps/incremental/CompositeLookupsCacheAttributes.kt      | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
index 8280c4f2af3..626b78c4458 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
@@ -96,7 +96,7 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta
         context.ensureLookupsCacheAttributesSaved()
 
         targets.forEach {
-            it.initialLocalCacheAttributesDiff.saveExpectedIfNeeded()
+            it.initialLocalCacheAttributesDiff.manager.writeVersion()
         }
 
         val serializedMetaInfo = representativeTarget.buildMetaInfoFactory.serializeToString(compilerArguments)
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
index 2abc23db574..1eaa8a049d6 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
@@ -149,7 +149,7 @@ class KotlinCompileContext(val jpsContext: CompileContext) {
      */
     fun ensureLookupsCacheAttributesSaved() {
         if (lookupAttributesSaved.compareAndSet(false, true)) {
-            initialLookupsCacheStateDiff.saveExpectedIfNeeded()
+            initialLookupsCacheStateDiff.manager.writeVersion()
         }
     }
 
@@ -207,7 +207,7 @@ class KotlinCompileContext(val jpsContext: CompileContext) {
     private fun clearLookupCache() {
         KotlinBuilder.LOG.info("Clearing lookup cache")
         dataManager.cleanLookupStorage(KotlinBuilder.LOG)
-        initialLookupsCacheStateDiff.saveExpectedIfNeeded()
+        initialLookupsCacheStateDiff.manager.writeVersion()
     }
 
     fun cleanupCaches() {
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt
index e50c18e9471..5e9c6a9f16f 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt
@@ -47,12 +47,12 @@ class CompositeLookupsCacheAttributesManager(
         return CompositeLookupsCacheAttributes(version.version, components)
     }
 
-    override fun writeActualVersion(values: CompositeLookupsCacheAttributes?) {
+    override fun writeVersion(values: CompositeLookupsCacheAttributes?) {
         if (values == null) {
-            versionManager.writeActualVersion(null)
+            versionManager.writeVersion(null)
             actualComponentsFile.delete()
         } else {
-            versionManager.writeActualVersion(CacheVersion(values.version))
+            versionManager.writeVersion(CacheVersion(values.version))
 
             actualComponentsFile.parentFile.mkdirs()
             actualComponentsFile.writeText(values.components.joinToString("\n"))