Consolidate GlobDescriptor functionality

Makes GlobDescriptor directly implement SkyKey and adds custom serialization
logic. This lets us narrow visibility and migrate yet another SkyKey away from
LegacySkyKey.

PiperOrigin-RevId: 180705483

2 files changed, 80 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index a92f87161b..a4b01da481 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -78,6 +78,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/concurrent",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+        "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
         "//src/main/java/com/google/devtools/build/skyframe",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobDescriptorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobDescriptorTest.java
new file mode 100644
index 0000000000..3601eaa0b0
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobDescriptorTest.java
@@ -0,0 +1,79 @@
+// Copyright 2017 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 static com.google.common.truth.Truth.assertThat;
+
+import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
+import com.google.devtools.build.lib.cmdline.PackageIdentifier;
+import com.google.devtools.build.lib.skyframe.serialization.testutils.FsUtils;
+import com.google.devtools.build.lib.skyframe.serialization.testutils.ObjectCodecTester;
+import com.google.devtools.build.lib.vfs.PathCodec;
+import com.google.devtools.build.lib.vfs.PathFragment;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link GlobDescriptor}. */
+@RunWith(JUnit4.class)
+public class GlobDescriptorTest {
+
+  @Test
+  public void testSerialization() throws Exception {
+    ObjectCodecTester.newBuilder(GlobDescriptor.getCodec(new PathCodec(FsUtils.TEST_FILESYSTEM)))
+        .addSubjects(
+            GlobDescriptor.create(
+                PackageIdentifier.create("@foo", PathFragment.create("//bar")),
+                FsUtils.TEST_FILESYSTEM.getPath("/packageRoot"),
+                PathFragment.create("subdir"),
+                "pattern",
+                /*excludeDirs=*/ false),
+            GlobDescriptor.create(
+                PackageIdentifier.create("@bar", PathFragment.create("//foo")),
+                FsUtils.TEST_FILESYSTEM.getPath("/anotherPackageRoot"),
+                PathFragment.create("anotherSubdir"),
+                "pattern",
+                /*excludeDirs=*/ true))
+        .verificationFunction(
+            (orig, deserialized) -> assertThat(deserialized).isSameAs(orig))
+        .buildAndRunTests();
+  }
+
+  @Test
+  public void testCreateReturnsInternedInstances() throws LabelSyntaxException {
+    GlobDescriptor original = GlobDescriptor.create(
+        PackageIdentifier.create("@foo", PathFragment.create("//bar")),
+        FsUtils.TEST_FILESYSTEM.getPath("/packageRoot"),
+        PathFragment.create("subdir"),
+        "pattern",
+        /*excludeDirs=*/ false);
+
+    GlobDescriptor sameCopy = GlobDescriptor.create(
+        original.getPackageId(),
+        original.getPackageRoot(),
+        original.getSubdir(),
+        original.getPattern(),
+        original.excludeDirs());
+    assertThat(sameCopy).isSameAs(original);
+
+    GlobDescriptor diffCopy = GlobDescriptor.create(
+        original.getPackageId(),
+        original.getPackageRoot(),
+        original.getSubdir(),
+        original.getPattern(),
+        !original.excludeDirs());
+    assertThat(diffCopy).isNotEqualTo(original);
+  }
+
+}