Refactor NestedSet to permit alternate NestedSetStore implementations.

PiperOrigin-RevId: 194787067

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecWithStore.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecWithStore.java
index 0923404ee7..285bd6f230 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecWithStore.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecWithStore.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.collect.nestedset;
 
+import com.google.devtools.build.lib.collect.nestedset.NestedSetStore.FingerprintComputationResult;
 import com.google.devtools.build.lib.skyframe.serialization.DeserializationContext;
 import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
 import com.google.devtools.build.lib.skyframe.serialization.SerializationConstants;
@@ -70,9 +71,9 @@ public class NestedSetCodecWithStore<T> implements ObjectCodec<NestedSet<T>> {
       context.serialize(obj.rawChildren(), codedOut);
     } else {
       context.serialize(NestedSetSize.GROUP, codedOut);
-      ByteString fingerprint =
+      FingerprintComputationResult fingerprintComputationResult =
           nestedSetStore.computeFingerprintAndStore((Object[]) obj.rawChildren(), context);
-      codedOut.writeByteArrayNoTag(fingerprint.toByteArray());
+      codedOut.writeByteArrayNoTag(fingerprintComputationResult.fingerprint().toByteArray());
     }
   }