Damien Martin-guillerez has submitted this change and it was merged.
Change subject: Remove unused constructor and inline create method.
......................................................................
Remove unused constructor and inline create method.
--
Change-Id: Ica96bd719fe9d7e152fbe78e71669fddefe12e92
Reviewed-on:
https://bazel-review.googlesource.com/#/c/1640/
MOS_MIGRATED_REVID=99182210
---
M
src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
1 file changed, 20 insertions(+), 39 deletions(-)
diff --git
a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index a1ac8e2..4d6fffc 100644
---
a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++
b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -110,8 +110,11 @@
this.diffAwarenessManager = new
DiffAwarenessManager(diffAwarenessFactories, reporter);
}
- private SequencedSkyframeExecutor(Reporter reporter, PackageFactory
pkgFactory,
- TimestampGranularityMonitor tsgm, BlazeDirectories directories,
+ public static SequencedSkyframeExecutor create(
+ Reporter reporter,
+ PackageFactory pkgFactory,
+ TimestampGranularityMonitor tsgm,
+ BlazeDirectories directories,
Factory workspaceStatusActionFactory,
ImmutableList<BuildInfoFactory> buildInfoFactories,
Set<Path> immutableDirectories,
@@ -120,45 +123,23 @@
Preprocessor.Factory.Supplier preprocessorFactorySupplier,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues) {
- this(reporter, InMemoryMemoizingEvaluator.SUPPLIER, pkgFactory, tsgm,
- directories, workspaceStatusActionFactory, buildInfoFactories,
immutableDirectories,
- diffAwarenessFactories, allowedMissingInputs,
preprocessorFactorySupplier,
- extraSkyFunctions, extraPrecomputedValues);
- }
-
- private static SequencedSkyframeExecutor create(Reporter reporter,
- EvaluatorSupplier evaluatorSupplier, PackageFactory pkgFactory,
- TimestampGranularityMonitor tsgm, BlazeDirectories directories,
- Factory workspaceStatusActionFactory,
ImmutableList<BuildInfoFactory> buildInfoFactories,
- Set<Path> immutableDirectories,
- Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
- Predicate<PathFragment> allowedMissingInputs,
- Preprocessor.Factory.Supplier preprocessorFactorySupplier,
- ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues) {
- SequencedSkyframeExecutor skyframeExecutor = new
SequencedSkyframeExecutor(reporter,
- evaluatorSupplier, pkgFactory, tsgm, directories,
workspaceStatusActionFactory,
- buildInfoFactories, immutableDirectories, diffAwarenessFactories,
allowedMissingInputs,
- preprocessorFactorySupplier,
- extraSkyFunctions, extraPrecomputedValues);
+ SequencedSkyframeExecutor skyframeExecutor =
+ new SequencedSkyframeExecutor(
+ reporter,
+ InMemoryMemoizingEvaluator.SUPPLIER,
+ pkgFactory,
+ tsgm,
+ directories,
+ workspaceStatusActionFactory,
+ buildInfoFactories,
+ immutableDirectories,
+ diffAwarenessFactories,
+ allowedMissingInputs,
+ preprocessorFactorySupplier,
+ extraSkyFunctions,
+ extraPrecomputedValues);
skyframeExecutor.init();
return skyframeExecutor;
- }
-
- public static SequencedSkyframeExecutor create(Reporter reporter,
PackageFactory pkgFactory,
- TimestampGranularityMonitor tsgm, BlazeDirectories directories,
- Factory workspaceStatusActionFactory,
- ImmutableList<BuildInfoFactory> buildInfoFactories,
- Set<Path> immutableDirectories,
- Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
- Predicate<PathFragment> allowedMissingInputs,
- Preprocessor.Factory.Supplier preprocessorFactorySupplier,
- ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues) {
- return create(reporter, InMemoryMemoizingEvaluator.SUPPLIER,
pkgFactory, tsgm,
- directories, workspaceStatusActionFactory, buildInfoFactories,
immutableDirectories,
- diffAwarenessFactories, allowedMissingInputs,
preprocessorFactorySupplier,
- extraSkyFunctions, extraPrecomputedValues);
}
@VisibleForTesting
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica96bd719fe9d7e152fbe78e71669fddefe12e92
Gerrit-PatchSet: 3
Gerrit-Project: bazel
Gerrit-Branch: master
Gerrit-Owner: Janak Ramakrishnan <
jan...@google.com>