diff options
Diffstat (limited to 'src/main')
4 files changed, 9 insertions, 102 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index c48d1efc27..6418d6d012 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -191,6 +191,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization", + "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", @@ -484,6 +485,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/profiler/memory:current_rule_tracker", "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization", + "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionKeyCodec.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionKeyCodec.java deleted file mode 100644 index d466391e39..0000000000 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionKeyCodec.java +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2015 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; - -import com.google.common.collect.ImmutableSortedSet; -import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.cmdline.LabelCodec; -import com.google.devtools.build.lib.skyframe.TestSuiteExpansionValue.TestSuiteExpansionKey; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; -import com.google.devtools.build.lib.skyframe.serialization.SerializationException; -import com.google.protobuf.CodedInputStream; -import com.google.protobuf.CodedOutputStream; -import java.io.IOException; -import java.util.Comparator; - -/** Custom serialization for {@link TestSuiteExpansionKey}. */ -class TestSuiteExpansionKeyCodec implements ObjectCodec<TestSuiteExpansionKey> { - public static final TestSuiteExpansionKeyCodec INSTANCE = new TestSuiteExpansionKeyCodec(); - - private TestSuiteExpansionKeyCodec() {} - - @Override - public Class<TestSuiteExpansionKey> getEncodedClass() { - return TestSuiteExpansionKey.class; - } - - @Override - public void serialize(TestSuiteExpansionKey key, CodedOutputStream codedOut) - throws IOException, SerializationException { - // Writes the target count to the stream so deserialization knows when to stop. - codedOut.writeInt32NoTag(key.getTargets().size()); - for (Label label : key.getTargets()) { - LabelCodec.INSTANCE.serialize(label, codedOut); - } - } - - @Override - public TestSuiteExpansionKey deserialize(CodedInputStream codedIn) - throws SerializationException, IOException { - int size = codedIn.readInt32(); - ImmutableSortedSet.Builder<Label> builder = - new ImmutableSortedSet.Builder<>(Comparator.naturalOrder()); - for (int i = 0; i < size; ++i) { - builder.add(LabelCodec.INSTANCE.deserialize(codedIn)); - } - return new TestSuiteExpansionKey(builder.build()); - } -} diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java index 10291a6798..a4a41cb1ea 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.skyframe.serialization.NotSerializableRuntimeException; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.SkyFunctionName; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; @@ -75,10 +76,11 @@ public final class TestSuiteExpansionValue implements SkyValue { } /** A list of targets of which all test suites should be expanded. */ + @AutoCodec @ThreadSafe static final class TestSuiteExpansionKey implements SkyKey { public static final ObjectCodec<TestSuiteExpansionKey> CODEC = - TestSuiteExpansionKeyCodec.INSTANCE; + new TestSuiteExpansionValue_TestSuiteExpansionKey_AutoCodec(); private final ImmutableSortedSet<Label> targets; diff --git a/src/main/java/com/google/devtools/build/lib/util/RegexFilter.java b/src/main/java/com/google/devtools/build/lib/util/RegexFilter.java index 07081ebb60..4ae8e7f5c2 100644 --- a/src/main/java/com/google/devtools/build/lib/util/RegexFilter.java +++ b/src/main/java/com/google/devtools/build/lib/util/RegexFilter.java @@ -17,12 +17,9 @@ package com.google.devtools.build.lib.util; import com.google.common.base.Joiner; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; -import com.google.devtools.build.lib.skyframe.serialization.SerializationException; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.Converter; import com.google.devtools.common.options.OptionsParsingException; -import com.google.protobuf.CodedInputStream; -import com.google.protobuf.CodedOutputStream; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -37,8 +34,11 @@ import javax.annotation.Nullable; * <p>String is considered to be included into the filter if it does not match any of the excluded * regex expressions and if it matches at least one included regex expression. */ +@AutoCodec @Immutable public final class RegexFilter { + public static final ObjectCodec<RegexFilter> CODEC = new RegexFilter_AutoCodec(); + // Null inclusion or exclusion pattern means those patterns are not used. @Nullable private final Pattern inclusionPattern; @Nullable private final Pattern exclusionPattern; @@ -186,42 +186,4 @@ public final class RegexFilter { public int hashCode() { return hashCode; } - - public static final ObjectCodec<RegexFilter> CODEC = new Codec(); - - // TODO(shahan): replace with @AutoCodec once it's ready. - private static class Codec implements ObjectCodec<RegexFilter> { - - @Override - public Class<RegexFilter> getEncodedClass() { - return RegexFilter.class; - } - - @Override - public void serialize(RegexFilter filter, CodedOutputStream codedOut) - throws SerializationException, IOException { - serializeFilterString(filter.getInclusionRegex(), codedOut); - serializeFilterString(filter.getExclusionRegex(), codedOut); - } - - private void serializeFilterString(@Nullable String regex, CodedOutputStream codedOut) - throws IOException { - if (regex == null) { - codedOut.writeBoolNoTag(false); - } else { - codedOut.writeBoolNoTag(true); - codedOut.writeStringNoTag(regex); - } - } - - @Override - public RegexFilter deserialize(CodedInputStream codedIn) - throws SerializationException, IOException { - return new RegexFilter(deserializeFilterString(codedIn), deserializeFilterString(codedIn)); - } - - private String deserializeFilterString(CodedInputStream codedIn) throws IOException { - return codedIn.readBool() ? codedIn.readString() : null; - } - } } |