diff options
author | nharmata <nharmata@google.com> | 2017-04-04 17:11:39 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2017-04-05 15:18:20 +0200 |
commit | b4060b6e53944a7c3bdc5e62b288e7293a87652a (patch) | |
tree | 59b0f1f3d3e8e99412e060bb98b5a37fe90d9b6e /src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java | |
parent | 3ac77cb94a4cf1bd1993a97fe79f2005b2b1a711 (diff) |
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
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java index 5eb13b326d..68f0386bd6 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java @@ -303,7 +303,7 @@ public class FileFunctionTest { rootedPath("a"), rootedPath(""), RootedPath.toRootedPath(fs.getRootDirectory(), PathFragment.EMPTY_FRAGMENT), - RootedPath.toRootedPath(fs.getRootDirectory(), new PathFragment("outside"))); + RootedPath.toRootedPath(fs.getRootDirectory(), PathFragment.create("outside"))); } @Test @@ -320,7 +320,7 @@ public class FileFunctionTest { rootedPath("a"), rootedPath(""), RootedPath.toRootedPath(fs.getRootDirectory(), PathFragment.EMPTY_FRAGMENT), - RootedPath.toRootedPath(fs.getRootDirectory(), new PathFragment("absolute"))); + RootedPath.toRootedPath(fs.getRootDirectory(), PathFragment.create("absolute"))); } @Test @@ -341,10 +341,10 @@ public class FileFunctionTest { rootedPath("a"), rootedPath(""), RootedPath.toRootedPath(root, PathFragment.EMPTY_FRAGMENT), - RootedPath.toRootedPath(root, new PathFragment("output_base")), - RootedPath.toRootedPath(root, new PathFragment("output_base/external")), - RootedPath.toRootedPath(root, new PathFragment("output_base/external/a")), - RootedPath.toRootedPath(root, new PathFragment("output_base/external/a/b"))); + RootedPath.toRootedPath(root, PathFragment.create("output_base")), + RootedPath.toRootedPath(root, PathFragment.create("output_base/external")), + RootedPath.toRootedPath(root, PathFragment.create("output_base/external/a")), + RootedPath.toRootedPath(root, PathFragment.create("output_base/external/a/b"))); } @Test @@ -1584,12 +1584,12 @@ public class FileFunctionTest { private Path symlink(String link, String target) throws Exception { Path path = path(link); FileSystemUtils.createDirectoryAndParents(path.getParentDirectory()); - path.createSymbolicLink(new PathFragment(target)); + path.createSymbolicLink(PathFragment.create(target)); return path; } private Path path(String rootRelativePath) { - return pkgRoot.getRelative(new PathFragment(rootRelativePath)); + return pkgRoot.getRelative(PathFragment.create(rootRelativePath)); } private RootedPath rootedPath(String pathString) { |