diff options
| author |  ulfjack <ulfjack@google.com> | 2017-12-21 10:52:16 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-21 10:54:16 -0800 |
| commit | 4abd6c30f99635b803b9170baa3de1e3f3b2859d (patch) | |
| tree | 843d18ad6b49d0cda1298ebd2440e46b5ef4a54b /src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java | |
| parent | 62dfea75efc831b153306985241d24ee7deb5bc5 (diff) | |
Move FileStateValue.Type to Metadata; add Metadata.getType()
This is in preparation for merging FileArtifactValue and FileStateValue.
Progress on #3360.
PiperOrigin-RevId: 179832948
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java index acac707c92..965c4c5fbb 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java @@ -18,8 +18,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.devtools.build.lib.actions.FileStateType; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; -import com.google.devtools.build.lib.skyframe.FileStateValue.Type; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; @@ -69,7 +69,7 @@ public class FileFunction implements SkyFunction { } realRootedPath = resolvedState.getFirst(); realFileStateValue = resolvedState.getSecond(); - if (realFileStateValue.getType() == Type.NONEXISTENT) { + if (realFileStateValue.getType() == FileStateType.NONEXISTENT) { return FileValue.value( rootedPath, FileStateValue.NONEXISTENT_FILE_STATE_NODE, @@ -95,7 +95,7 @@ public class FileFunction implements SkyFunction { ArrayList<RootedPath> symlinkChain = new ArrayList<>(); TreeSet<Path> orderedSeenPaths = Sets.newTreeSet(); - while (realFileStateValue.getType().equals(FileStateValue.Type.SYMLINK)) { + while (realFileStateValue.getType().isSymlink()) { symlinkChain.add(realRootedPath); orderedSeenPaths.add(realRootedPath.asPath()); Pair<RootedPath, FileStateValue> resolvedState = getSymlinkTargetRootedPath(realRootedPath, @@ -145,7 +145,7 @@ public class FileFunction implements SkyFunction { if (realFileStateValue == null) { return null; } - if (realFileStateValue.getType() != FileStateValue.Type.NONEXISTENT + if (realFileStateValue.getType() != FileStateType.NONEXISTENT && parentFileValue != null && !parentFileValue.isDirectory()) { String type = realFileStateValue.getType().toString().toLowerCase(); String message = type + " " + rootedPath.asPath() + " exists but its parent " |