commit 1fdf1e1e1c8b09205e527099942cc38636e53457
author leba <leba@google.com> Wed May 18 04:46:14 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 18 04:47:58 2022 -0700
tree ad05d83bf1a1912f9e682113f9db62ec41c355d3
parent 9b0518d1b20dec80c050704d371a53e0280480f3

Update #equals and #hashCode of BuildDriverKey to include all attributes.

These became stale as we added more attributes to BuildDriverKey.

PiperOrigin-RevId: 449451973

src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
index 32574dd..d2193c8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
@@ -104,14 +104,22 @@
     if (other instanceof BuildDriverKey) {
       BuildDriverKey otherBuildDriverKey = (BuildDriverKey) other;
       return actionLookupKey.equals(otherBuildDriverKey.actionLookupKey)
-          && topLevelArtifactContext.equals(otherBuildDriverKey.topLevelArtifactContext);
+          && topLevelArtifactContext.equals(otherBuildDriverKey.topLevelArtifactContext)
+          && testType.equals(otherBuildDriverKey.testType)
+          && strictActionConflictCheck == otherBuildDriverKey.strictActionConflictCheck
+          && explicitlyRequested == otherBuildDriverKey.explicitlyRequested;
     }
     return false;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(actionLookupKey, topLevelArtifactContext);
+    return Objects.hash(
+        actionLookupKey,
+        topLevelArtifactContext,
+        testType,
+        strictActionConflictCheck,
+        explicitlyRequested);
   }
 
   @Override