Short circuit userdev up-to-date checking on the last step when the d…

…ev bundle hasn't changed
PaperMC · Nov 17, 2023 · f7ff940 · f7ff940
1 parent c7d0820
commit f7ff940
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/...userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/SetupHandlerImpl.kt b/...userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/SetupHandlerImpl.kt
@@ -107,6 +107,7 @@ class SetupHandlerImpl(
         )
 
         StepExecutor.executeSteps(
+            bundle.changed,
             context,
             extractStep,
             filterVanillaJarStep,

diff --git a/...eight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/step/steps.kt b/...eight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/step/steps.kt
@@ -24,6 +24,7 @@ package io.papermc.paperweight.userdev.internal.setup.step
 
 import io.papermc.paperweight.userdev.internal.setup.SetupHandler
 import io.papermc.paperweight.userdev.internal.setup.UserdevSetup
+import io.papermc.paperweight.userdev.internal.setup.util.HashFunction
 import io.papermc.paperweight.userdev.internal.setup.util.HashFunctionBuilder
 import io.papermc.paperweight.userdev.internal.setup.util.buildHashFunction
 import java.nio.file.Path
@@ -61,20 +62,24 @@ object StepExecutor {
     private val inputOutputDataCache: MutableMap<KClass<out SetupStep>, InputOutputData> =
         ConcurrentHashMap<KClass<out SetupStep>, InputOutputData>()
 
-    fun executeSteps(context: SetupHandler.Context, vararg steps: SetupStep) {
+    fun executeSteps(expectingChange: Boolean, context: SetupHandler.Context, vararg steps: SetupStep) {
+        // if we aren't expecting change, assume the last step is the output that matters
+        // and only verify its inputs/outputs - if it fails then we need to go back through
+        // and check each step anyway
+        if (!expectingChange) {
+            val lastStep = steps.last()
+            if (makeHashFunction(lastStep).upToDate(lastStep.hashFile)) {
+                return
+            }
+        }
+
         for (step in steps) {
             executeStep(context, step)
         }
     }
 
     fun executeStep(context: SetupHandler.Context, step: SetupStep) {
-        val data = step.inputOutputData
-        val inputs = data.inputs.mapNotNull { it.get(step) }
-        val outputs = data.outputs.mapNotNull { it.get(step) }
-
-        val hashFunction = buildHashFunction(inputs, outputs) {
-            step.touchHashFunctionBuilder(this)
-        }
+        val hashFunction = makeHashFunction(step)
 
         if (hashFunction.upToDate(step.hashFile)) {
             return
@@ -89,6 +94,16 @@ object StepExecutor {
         hashFunction.writeHash(step.hashFile)
     }
 
+    private fun makeHashFunction(step: SetupStep): HashFunction {
+        val data = step.inputOutputData
+        val inputs = data.inputs.mapNotNull { it.get(step) }
+        val outputs = data.outputs.mapNotNull { it.get(step) }
+
+        return buildHashFunction(inputs, outputs) {
+            step.touchHashFunctionBuilder(this)
+        }
+    }
+
     private val SetupStep.inputOutputData: InputOutputData
         get() = inputOutputDataCache.computeIfAbsent(this::class) {
             InputOutputData(

diff --git a/...ev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/v2/SetupHandlerImplV2.kt b/...ev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/v2/SetupHandlerImplV2.kt
@@ -137,6 +137,7 @@ class SetupHandlerImplV2(
         )
 
         StepExecutor.executeSteps(
+            bundle.changed,
             context,
             downloadMcLibs,
             filterVanillaJarStep,