Add events and get rid of ErrorInfoEncoder. Clean up some signatures and visibility in Skyframe classes.

PiperOrigin-RevId: 197665817

4 files changed, 4 insertions, 26 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContext.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContext.java
index 45bde757b8..7a3dcaec10 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContext.java
@@ -106,7 +106,7 @@ public class DeserializationContext {
    * context.
    */
   @CheckReturnValue
-  DeserializationContext getMemoizingContext() {
+  public DeserializationContext getMemoizingContext() {
     if (deserializer != null) {
       return this;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContext.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContext.java
index c16c6479e6..dedbf2dab7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContext.java
@@ -102,7 +102,7 @@ public class SerializationContext {
    * context.
    */
   @CheckReturnValue
-  SerializationContext getMemoizingContext() {
+  public SerializationContext getMemoizingContext() {
     if (serializer != null) {
       return this;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationResult.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationResult.java
index a22f546c85..90a1598700 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationResult.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationResult.java
@@ -15,9 +15,7 @@
 package com.google.devtools.build.lib.skyframe.serialization;
 
 import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.ByteString;
 import javax.annotation.Nullable;
 
@@ -45,13 +43,6 @@ public abstract class SerializationResult<T> {
   public abstract <S> SerializationResult<S> with(S newObj);
 
   /**
-   * Returns a new {@link SerializationResult} with the same object but with a new future that waits
-   * on the given future as well as the current future.
-   */
-  public abstract SerializationResult<T> withAdditionalFuture(
-      ListenableFuture<Void> additionalFuture);
-
-  /**
    * Returns a {@link ListenableFuture} that, if not null, must complete successfully before {@link
    * #getObject} can be written remotely.
    */
@@ -86,11 +77,6 @@ public abstract class SerializationResult<T> {
     }
 
     @Override
-    public SerializationResult<T> withAdditionalFuture(ListenableFuture<Void> additionalFuture) {
-      return new ObjectWithFuture<>(getObject(), additionalFuture);
-    }
-
-    @Override
     public ListenableFuture<Void> getFutureToBlockWritesOn() {
       return null;
     }
@@ -110,14 +96,6 @@ public abstract class SerializationResult<T> {
     }
 
     @Override
-    public SerializationResult<T> withAdditionalFuture(ListenableFuture<Void> additionalFuture) {
-      ListenableFuture<Void> combinedFuture =
-          Futures.whenAllComplete(additionalFuture, futureToBlockWritesOn)
-              .call(() -> null, MoreExecutors.directExecutor());
-      return new ObjectWithFuture<>(getObject(), combinedFuture);
-    }
-
-    @Override
     public ListenableFuture<Void> getFutureToBlockWritesOn() {
       return futureToBlockWritesOn;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/SerializationTester.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/SerializationTester.java
index c8fda47539..69433b10dc 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/SerializationTester.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/SerializationTester.java
@@ -58,7 +58,7 @@ public class SerializationTester {
     void verifyDeserialized(T original, T deserialized) throws Exception;
   }
 
-  private final ImmutableList<Object> subjects;
+  private final ImmutableList<?> subjects;
   private final ImmutableMap.Builder<Class<?>, Object> dependenciesBuilder;
   private final ArrayList<ObjectCodec<?>> additionalCodecs = new ArrayList<>();
   private boolean memoize;
@@ -75,7 +75,7 @@ public class SerializationTester {
     this(ImmutableList.copyOf(subjects));
   }
 
-  public SerializationTester(ImmutableList<Object> subjects) {
+  public SerializationTester(ImmutableList<?> subjects) {
     Preconditions.checkArgument(!subjects.isEmpty());
     this.subjects = subjects;
     this.dependenciesBuilder = ImmutableMap.builder();