Add logging to ObjectCodecRegistry to give some indication of the serialization setup. This is to help developers eliminate serialization non-determinism as the source of a bug. It might be nice to write the hash somewhere and crash if there's a mismatch, but leaving that alone for now.
PiperOrigin-RevId: 214832705
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecRegistry.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecRegistry.java
index 2dabd7e..30c4aa8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecRegistry.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecRegistry.java
@@ -32,6 +32,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Supplier;
+import java.util.logging.Logger;
import javax.annotation.Nullable;
/**
@@ -40,7 +41,7 @@
* representation if desired.
*/
public class ObjectCodecRegistry {
-
+ private static final Logger logger = Logger.getLogger(ObjectCodecRegistry.class.getName());
/** Creates a new, empty builder. */
public static Builder newBuilder() {
return new Builder();
@@ -91,6 +92,7 @@
.filter((str) -> isAllowed(str, blacklistedClassNamePrefixes))
.collect(ImmutableList.toImmutableList());
this.dynamicCodecs = createDynamicCodecs(this.classNames, nextTag);
+ logger.info("Initialized " + this + " with approximate hash: " + deepHashCode());
}
public CodecDescriptor getCodecDescriptorForObject(Object obj)
@@ -414,4 +416,37 @@
throw new SerializationException.NoCodecException(
"No default codec available for " + className, type);
}
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("allowDefaultCodec", allowDefaultCodec)
+ .add("classMappedCodecs.size", classMappedCodecs.size())
+ .add("tagMappedCodecs.size", tagMappedCodecs.size())
+ .add("referenceConstantsStartTag", referenceConstantsStartTag)
+ .add("referenceConstants.size", referenceConstants.size())
+ .add("classNames.size", classNames.size())
+ .add("dynamicCodecs.size", dynamicCodecs.size())
+ .toString();
+ }
+
+ private int deepHashCode() {
+ int hash = this.toString().hashCode();
+ for (CodecDescriptor codecDescriptor : tagMappedCodecs) {
+ hash =
+ 37 * hash
+ + 31 * codecDescriptor.getTag()
+ + hashClass(codecDescriptor.getCodec().getEncodedClass());
+ }
+ for (Object referenceConstant : referenceConstants) {
+ // This doesn't catch two reference constants of the same class that are switched,
+ // unfortunately.
+ hash = 37 * hash + hashClass(referenceConstant.getClass());
+ }
+ return 37 * hash + classNames.hashCode();
+ }
+
+ private static int hashClass(Class<?> clazz) {
+ return clazz.getName().hashCode();
+ }
}
