commit b4060b6e53944a7c3bdc5e62b288e7293a87652a
author nharmata <nharmata@google.com> Tue Apr 04 17:11:39 2017 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Wed Apr 05 15:18:20 2017 +0200
tree 59b0f1f3d3e8e99412e060bb98b5a37fe90d9b6e
parent 3ac77cb94a4cf1bd1993a97fe79f2005b2b1a711

Refactor all ctor callsites of PathFragment to instead call a static 'create' method.

This paves the way for changing PathFragment to e.g. an abstract class with multiple subclasses. This way we can split out the windows-specific stuff into one of these concrete classes, making the code more readable and also saving memory (since the shallow heap size of the NonWindowsPathFragment subclass will hopefully be smaller than that of the current PathFragment).

This also lets us pursue gc churn optimizations. We can now do interning in PathFragment#create and can also get rid of unnecessary intermediate PathFragment allocations.

RELNOTES: None

PiperOrigin-RevId: 152145768

src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java
index e2aebba..2a6f85e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java
@@ -94,9 +94,9 @@
   @Test
   public void testHandlesUnprocessedDiffs() throws Exception {
     Path pathEntry = root.getRelative("pathEntry");
-    ModifiedFileSet diff1 = ModifiedFileSet.builder().modify(new PathFragment("file1")).build();
-    ModifiedFileSet diff2 = ModifiedFileSet.builder().modify(new PathFragment("file2")).build();
-    ModifiedFileSet diff3 = ModifiedFileSet.builder().modify(new PathFragment("file3")).build();
+    ModifiedFileSet diff1 = ModifiedFileSet.builder().modify(PathFragment.create("file1")).build();
+    ModifiedFileSet diff2 = ModifiedFileSet.builder().modify(PathFragment.create("file2")).build();
+    ModifiedFileSet diff3 = ModifiedFileSet.builder().modify(PathFragment.create("file3")).build();
     DiffAwarenessStub diffAwareness =
         new DiffAwarenessStub(ImmutableList.of(diff1, diff2, diff3, DiffAwarenessStub.BROKEN_DIFF));
     DiffAwarenessFactoryStub factory = new DiffAwarenessFactoryStub();
@@ -134,12 +134,12 @@
         new DiffAwarenessStub(ImmutableList.<ModifiedFileSet>of(), 1);
     factory1.inject(pathEntry, diffAwareness1);
     DiffAwarenessFactoryStub factory2 = new DiffAwarenessFactoryStub();
-    ModifiedFileSet diff2 = ModifiedFileSet.builder().modify(new PathFragment("file2")).build();
+    ModifiedFileSet diff2 = ModifiedFileSet.builder().modify(PathFragment.create("file2")).build();
     DiffAwarenessStub diffAwareness2 =
         new DiffAwarenessStub(ImmutableList.of(diff2, DiffAwarenessStub.BROKEN_DIFF));
     factory2.inject(pathEntry, diffAwareness2);
     DiffAwarenessFactoryStub factory3 = new DiffAwarenessFactoryStub();
-    ModifiedFileSet diff3 = ModifiedFileSet.builder().modify(new PathFragment("file3")).build();
+    ModifiedFileSet diff3 = ModifiedFileSet.builder().modify(PathFragment.create("file3")).build();
     DiffAwarenessStub diffAwareness3 = new DiffAwarenessStub(ImmutableList.of(diff3));
     factory3.inject(pathEntry, diffAwareness3);
     DiffAwarenessManager manager =
@@ -217,7 +217,7 @@
   private static class DiffAwarenessStub implements DiffAwareness {
 
     public static final ModifiedFileSet BROKEN_DIFF =
-        ModifiedFileSet.builder().modify(new PathFragment("special broken marker")).build();
+        ModifiedFileSet.builder().modify(PathFragment.create("special broken marker")).build();
 
     private boolean closed = false;
     private int curSequenceNum = 0;