Make some objects frequently encountered during serialization into constants. A lot of care is needed here because we're using reference equality. I plan to add value-equality constants in a follow-up.

Add ImmutableSortedSet marshaller because I think it might have been needed, and hey, why not.

PiperOrigin-RevId: 192326359

1 files changed, 55 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ImmutableSortedSetCodec.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ImmutableSortedSetCodec.java
new file mode 100644
index 0000000000..1517a6158b
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ImmutableSortedSetCodec.java
@@ -0,0 +1,55 @@
+// Copyright 2018 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.skyframe.serialization;
+
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
+import java.io.IOException;
+
+/**
+ * {@link ObjectCodec} for {@link ImmutableSortedSet}. Comparator must be serializable, ideally a
+ * registered constant.
+ */
+class ImmutableSortedSetCodec<E> implements ObjectCodec<ImmutableSortedSet<E>> {
+  @SuppressWarnings("unchecked")
+  @Override
+  public Class<ImmutableSortedSet<E>> getEncodedClass() {
+    return (Class<ImmutableSortedSet<E>>) (Class<?>) ImmutableSortedSet.class;
+  }
+
+  @Override
+  public void serialize(
+      SerializationContext context, ImmutableSortedSet<E> object, CodedOutputStream codedOut)
+      throws SerializationException, IOException {
+    context.serialize(object.comparator(), codedOut);
+    codedOut.writeInt32NoTag(object.size());
+    for (Object obj : object) {
+      context.serialize(obj, codedOut);
+    }
+  }
+
+  @Override
+  public ImmutableSortedSet<E> deserialize(DeserializationContext context, CodedInputStream codedIn)
+      throws SerializationException, IOException {
+    ImmutableSortedSet.Builder<E> builder =
+        ImmutableSortedSet.orderedBy(context.deserialize(codedIn));
+    int size = codedIn.readInt32();
+    for (int i = 0; i < size; i++) {
+      builder.add(context.<E>deserialize(codedIn));
+    }
+    return builder.build();
+  }
+}