diff options
author | Ulf Adams <ulfjack@google.com> | 2016-08-10 13:10:46 +0000 |
---|---|---|
committer | Yue Gan <yueg@google.com> | 2016-08-10 13:55:45 +0000 |
commit | 124bd0a7d32c28cc53ef8d8beab4e422d5ee9c42 (patch) | |
tree | e07f44003e204429656f911c0476e689b325597b /src/main/java/com | |
parent | 7db73d3236f59029a8a59c2a46d342eb897012b6 (diff) |
Remove the outputPath parameter from BlazeModule.getFileSystem.
It's never used, and it's tricky to run with multiple different file systems
in the same process -> remove it to simplify.
--
MOS_MIGRATED_REVID=129858142
Diffstat (limited to 'src/main/java/com')
3 files changed, 10 insertions, 30 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java index c7474f2854..9e3a377e06 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java @@ -18,11 +18,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.hash.HashCode; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.util.StringCanonicalizer; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.Path; -import com.google.devtools.build.lib.vfs.PathFragment; /** * Encapsulates the directories related to a workspace. @@ -69,9 +67,9 @@ public final class BlazeDirectories { String productName) { this.serverDirectories = serverDirectories; this.workspace = workspace; - boolean useDefaultExecRootName = this.workspace == null || this.workspace.isRootDirectory(); Path outputBase = serverDirectories.getOutputBase(); Path execRootBase = deepExecRoot ? outputBase.getChild("execroot") : outputBase; + boolean useDefaultExecRootName = this.workspace == null || this.workspace.isRootDirectory(); if (useDefaultExecRootName) { // TODO(bazel-team): if workspace is null execRoot should be null, but at the moment there is // a lot of code that depends on it being non-null. @@ -81,10 +79,6 @@ public final class BlazeDirectories { } String relativeOutputPath = getRelativeOutputPath(productName); this.outputPath = execRoot.getRelative(relativeOutputPath); - Preconditions.checkState(useDefaultExecRootName || outputPath.asFragment().equals( - outputPathFromOutputBase(outputBase.asFragment(), workspace.asFragment(), deepExecRoot, - productName))); - this.localOutputPath = outputBase.getRelative(relativeOutputPath); } @@ -157,21 +151,6 @@ public final class BlazeDirectories { } /** - * @param outputBase the outputBase as a path fragment. - * @param workspace the workspace as a path fragment. - * @return the outputPath as a path fragment, given the outputBase. - */ - public static PathFragment outputPathFromOutputBase( - PathFragment outputBase, PathFragment workspace, boolean deepExecRoot, String productName) { - PathFragment execRoot = deepExecRoot ? outputBase.getChild("execroot") : outputBase; - - if (workspace.equals(PathFragment.EMPTY_FRAGMENT)) { - return execRoot; - } - return execRoot.getRelative(workspace.getBaseName() + "/" + getRelativeOutputPath(productName)); - } - - /** * Returns the local output path used by this Blaze instance. */ public Path getLocalOutputPath() { diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java index 08e827b2d4..634a0b5c52 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java @@ -38,7 +38,6 @@ import com.google.devtools.build.lib.util.AbruptExitException; import com.google.devtools.build.lib.util.Clock; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.Path; -import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsClassProvider; import com.google.devtools.common.options.OptionsProvider; @@ -59,7 +58,7 @@ public abstract class BlazeModule { /** * Returns the extra startup options this module contributes. * - * <p>This method will be called at the beginning of Blaze startup (before #blazeStartup). + * <p>This method will be called at the beginning of Blaze startup (before {@link #globalInit}). */ public Iterable<Class<? extends OptionsBase>> getStartupOptions() { return ImmutableList.of(); @@ -69,8 +68,11 @@ public abstract class BlazeModule { * Called before {@link #getFileSystem} and {@link #blazeStartup}. * * <p>This method will be called at the beginning of Blaze startup. + * + * @param startupOptions the server's startup options + * + * @throws AbruptExitException to shut down the server immediately */ - @SuppressWarnings("unused") public void globalInit(OptionsProvider startupOptions) throws AbruptExitException { } @@ -80,9 +82,10 @@ public abstract class BlazeModule { * * <p>This method will be called at the beginning of Blaze startup (in-between #globalInit and * #blazeStartup). + * + * @param startupOptions the server's startup options */ - @SuppressWarnings("unused") - public FileSystem getFileSystem(OptionsProvider startupOptions, PathFragment outputPath) { + public FileSystem getFileSystem(OptionsProvider startupOptions) { return null; } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java index 851f647bfa..eb3e6a67a1 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java @@ -882,11 +882,9 @@ public final class BlazeRuntime { "Bad --output_base option specified: '" + outputBase + "'"); } - PathFragment outputPathFragment = BlazeDirectories.outputPathFromOutputBase( - outputBase, workspaceDirectory, startupOptions.deepExecRoot, productName); FileSystem fs = null; for (BlazeModule module : blazeModules) { - FileSystem moduleFs = module.getFileSystem(options, outputPathFragment); + FileSystem moduleFs = module.getFileSystem(options); if (moduleFs != null) { Preconditions.checkState(fs == null, "more than one module returns a file system"); fs = moduleFs; |