diff options
3 files changed, 71 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodec.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodec.java index 255456139a..a4954ab740 100644 --- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodec.java +++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodec.java @@ -19,6 +19,7 @@ import com.google.common.hash.HashingOutputStream; import com.google.devtools.build.lib.skyframe.serialization.DeserializationContext; import com.google.devtools.build.lib.skyframe.serialization.EnumCodec; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; +import com.google.devtools.build.lib.skyframe.serialization.SerializationConstants; import com.google.devtools.build.lib.skyframe.serialization.SerializationContext; import com.google.devtools.build.lib.skyframe.serialization.SerializationException; import com.google.protobuf.ByteString; @@ -54,6 +55,11 @@ public class NestedSetCodec<T> implements ObjectCodec<NestedSet<T>> { @Override public void serialize(SerializationContext context, NestedSet<T> obj, CodedOutputStream codedOut) throws SerializationException, IOException { + if (!SerializationConstants.shouldSerializeNestedSet) { + // Don't perform NestedSet serialization in testing + return; + } + // Topo sort the nested set to ensure digests are available for children at time of writing Collection<Object> topoSortedChildren = getTopologicallySortedChildren(obj); Map<Object, byte[]> childToDigest = new IdentityHashMap<>(); @@ -67,6 +73,11 @@ public class NestedSetCodec<T> implements ObjectCodec<NestedSet<T>> { @Override public NestedSet<T> deserialize(DeserializationContext context, CodedInputStream codedIn) throws SerializationException, IOException { + if (!SerializationConstants.shouldSerializeNestedSet) { + // Don't perform NestedSet deserialization in testing + return NestedSetBuilder.emptySet(Order.STABLE_ORDER); + } + Map<ByteString, Object> digestToChild = new HashMap<>(); int nestedSetCount = codedIn.readInt32(); Preconditions.checkState( diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationConstants.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationConstants.java new file mode 100644 index 0000000000..e3886dd276 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationConstants.java @@ -0,0 +1,47 @@ +// 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; + +/** + * Some static constants for deciding serialization behavior. + */ +public class SerializationConstants { + + /** + * If true, we attempt to to serialize ConfiguredTargetValue in testing. + */ + public static final boolean VALIDATE_CONFIGURED_TARGET_VALUE = + System.getenv("DONT_VALIDATE_CONFIGURED_TARGET_VALUE") == null; + + private static final boolean IN_TEST = System.getenv("TEST_TMPDIR") != null; + private static final boolean CHECK_SERIALIZATION = + System.getenv("DONT_SANITY_CHECK_SERIALIZATION") == null; + + private static final boolean TEST_NESTED_SET_SERIALIZATION = + System.getenv("TEST_NESTED_SET_SERIALIZATION") != null; + + /** + * If true, serialization should include NestedSet. Non-final so tests can opt-in to NestedSet + * serialization. + */ + public static boolean shouldSerializeNestedSet = TEST_NESTED_SET_SERIALIZATION || !IN_TEST; + + /** + * Returns true if serialization should be validated on all Skyframe writes. + */ + public static boolean shouldCheckSerializationBecauseInTest() { + return IN_TEST && CHECK_SERIALIZATION; + } +} diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java index da9702abca..978d7a0bb5 100644 --- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java +++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java @@ -15,7 +15,10 @@ package com.google.devtools.build.lib.collect.nestedset; import static com.google.common.truth.Truth.assertThat; +import com.google.devtools.build.lib.skyframe.serialization.SerializationConstants; import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -27,6 +30,16 @@ public class NestedSetCodecTest { private static final NestedSet<String> SHARED_NESTED_SET = NestedSetBuilder.<String>stableOrder().add("e").build(); + @Before + public void setUp() { + SerializationConstants.shouldSerializeNestedSet = true; + } + + @After + public void tearDown() { + SerializationConstants.shouldSerializeNestedSet = false; + } + @Test public void testCodec() throws Exception { new SerializationTester( |