[IC] Rename DummyCompilationTransaction -> NonRecoverableCompilationTransaction
This commit is contained in:
committed by
Space Team
parent
25a3dcf3d1
commit
493da2a8b4
@@ -82,9 +82,9 @@ inline fun <R> CompilationTransaction.runWithin(
|
||||
}
|
||||
|
||||
/**
|
||||
* A dummy implementation of compilation transaction
|
||||
* A non-recoverable implementation of compilation transaction. Changes reverting on failure should be performed externally if needed.
|
||||
*/
|
||||
class DummyCompilationTransaction : CompilationTransaction {
|
||||
class NonRecoverableCompilationTransaction : CompilationTransaction {
|
||||
override fun registerAddedOrChangedFile(outputFile: Path) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ private fun createDefaultPathConverter(rootProjectDir: File?) = IncrementalFileT
|
||||
class IncrementalCompilationContext(
|
||||
val pathConverter: FileToPathConverter,
|
||||
val storeFullFqNamesInLookupCache: Boolean = false,
|
||||
val transaction: CompilationTransaction = DummyCompilationTransaction(),
|
||||
val transaction: CompilationTransaction = NonRecoverableCompilationTransaction(),
|
||||
val reporter: ICReporter = DoNothingICReporter,
|
||||
/**
|
||||
* Controls whether changes in lookup cache should be tracked. Required for the classpath snapshots based IC approach
|
||||
@@ -32,7 +32,7 @@ class IncrementalCompilationContext(
|
||||
constructor(
|
||||
rootProjectDir: File?,
|
||||
storeFullFqNamesInLookupCache: Boolean = false,
|
||||
transaction: CompilationTransaction = DummyCompilationTransaction(),
|
||||
transaction: CompilationTransaction = NonRecoverableCompilationTransaction(),
|
||||
reporter: ICReporter = DoNothingICReporter,
|
||||
trackChangesInLookupCache: Boolean = false,
|
||||
keepIncrementalCompilationCachesInMemory: Boolean = false,
|
||||
|
||||
@@ -33,8 +33,8 @@ abstract class BaseCompilationTransactionTest {
|
||||
}
|
||||
}
|
||||
|
||||
class DummyCompilationTransactionTest : BaseCompilationTransactionTest() {
|
||||
override fun createTransaction() = DummyCompilationTransaction()
|
||||
class NonRecoverableCompilationTransactionTest : BaseCompilationTransactionTest() {
|
||||
override fun createTransaction() = NonRecoverableCompilationTransaction()
|
||||
|
||||
@Test
|
||||
fun testModifyingExistingFileOnSuccess() {
|
||||
|
||||
+2
-2
@@ -268,7 +268,7 @@ abstract class IncrementalCompilerRunner<
|
||||
reporter.debug { "Cleaning ${outputDirsToClean.size} output directories" }
|
||||
cleanOrCreateDirectories(outputDirsToClean)
|
||||
}
|
||||
val icContext = createIncrementalCompilationContext(projectDir, DummyCompilationTransaction())
|
||||
val icContext = createIncrementalCompilationContext(projectDir, NonRecoverableCompilationTransaction())
|
||||
return createCacheManager(icContext, args).use { caches ->
|
||||
if (trackChangedFiles) {
|
||||
caches.inputsCache.sourceSnapshotMap.compareAndUpdate(allSourceFiles)
|
||||
@@ -405,7 +405,7 @@ abstract class IncrementalCompilerRunner<
|
||||
private fun createTransaction() = if (preciseCompilationResultsBackup) {
|
||||
RecoverableCompilationTransaction(reporter, Files.createTempDirectory("kotlin-backups"))
|
||||
} else {
|
||||
DummyCompilationTransaction()
|
||||
NonRecoverableCompilationTransaction()
|
||||
}
|
||||
|
||||
protected open fun performWorkBeforeCompilation(compilationMode: CompilationMode, args: Args) {}
|
||||
|
||||
@@ -13,9 +13,7 @@ import org.jetbrains.jps.incremental.fs.CompilationRound
|
||||
import org.jetbrains.jps.incremental.messages.BuildMessage
|
||||
import org.jetbrains.jps.incremental.messages.CompilerMessage
|
||||
import org.jetbrains.kotlin.build.joinToReadableString
|
||||
import org.jetbrains.kotlin.build.report.DoNothingICReporter
|
||||
import org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME
|
||||
import org.jetbrains.kotlin.incremental.DummyCompilationTransaction
|
||||
import org.jetbrains.kotlin.incremental.IncrementalCompilationContext
|
||||
import org.jetbrains.kotlin.incremental.LookupSymbol
|
||||
import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
|
||||
|
||||
Reference in New Issue
Block a user