honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf(ngcc): only create tasks for non-processed formats (#35719) 

Change the behaviour in `analyzeEntryPoints` to only create tasks for non-processed formats.

PR Close #35719
This commit is contained in:
Alan Agius 2020-02-28 08:53:07 +01:00 committed by atscott
parent dc40a93317
commit d7efc45c04
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/compiler-cli/ngcc/src/execution/api.ts
View File

@ -61,7 +61,7 @@ export interface Task extends JsonObject {
/** /**
* The list of all format properties (including `task.formatProperty`) that should be marked as * The list of all format properties (including `task.formatProperty`) that should be marked as
* processed once the taksk has been completed, because they point to the format-path that will be * processed once the task has been completed, because they point to the format-path that will be
* processed as part of the task. * processed as part of the task.
*/ */
formatPropertiesToMarkAsProcessed: EntryPointJsonProperty[]; formatPropertiesToMarkAsProcessed: EntryPointJsonProperty[];
@ -75,9 +75,6 @@ export type TaskCompletedCallback = (task: Task, outcome: TaskProcessingOutcome)
/** Represents the outcome of processing a `Task`. */ /** Represents the outcome of processing a `Task`. */
export const enum TaskProcessingOutcome { export const enum TaskProcessingOutcome {
/** The target format property was already processed - didn't have to do anything. */
AlreadyProcessed,
/** Successfully processed the target format property. */ /** Successfully processed the target format property. */
Processed, Processed,
} }

15
packages/compiler-cli/ngcc/src/main.ts
View File

@ -33,7 +33,7 @@ import {ParallelTaskQueue} from './execution/task_selection/parallel_task_queue'
import {SerialTaskQueue} from './execution/task_selection/serial_task_queue'; import {SerialTaskQueue} from './execution/task_selection/serial_task_queue';
import {ConsoleLogger, LogLevel} from './logging/console_logger'; import {ConsoleLogger, LogLevel} from './logging/console_logger';
import {Logger} from './logging/logger'; import {Logger} from './logging/logger';
import {hasBeenProcessed, markAsProcessed} from './packages/build_marker'; import {hasBeenProcessed} from './packages/build_marker';
import {NgccConfiguration} from './packages/configuration'; import {NgccConfiguration} from './packages/configuration';
import {EntryPoint, EntryPointJsonProperty, EntryPointPackageJson, SUPPORTED_FORMAT_PROPERTIES, getEntryPointFormat} from './packages/entry_point'; import {EntryPoint, EntryPointJsonProperty, EntryPointPackageJson, SUPPORTED_FORMAT_PROPERTIES, getEntryPointFormat} from './packages/entry_point';
import {makeEntryPointBundle} from './packages/entry_point_bundle'; import {makeEntryPointBundle} from './packages/entry_point_bundle';
@ -207,6 +207,12 @@ export function mainNgcc(
} }
for (const formatProperty of propertiesToProcess) { for (const formatProperty of propertiesToProcess) {
if (hasBeenProcessed(entryPoint.packageJson, formatProperty)) {
// The format-path which the property maps to is already processed - nothing to do.
logger.debug(`Skipping ${entryPoint.name} : ${formatProperty} (already compiled).`);
continue;
}
const formatPropertiesToMarkAsProcessed = equivalentPropertiesMap.get(formatProperty) !; const formatPropertiesToMarkAsProcessed = equivalentPropertiesMap.get(formatProperty) !;
tasks.push({entryPoint, formatProperty, formatPropertiesToMarkAsProcessed, processDts}); tasks.push({entryPoint, formatProperty, formatPropertiesToMarkAsProcessed, processDts});
@ -256,13 +262,6 @@ export function mainNgcc(
`${formatProperty} (formatPath: ${formatPath} | format: ${format})`); `${formatProperty} (formatPath: ${formatPath} | format: ${format})`);
} }
// The format-path which the property maps to is already processed - nothing to do.
if (hasBeenProcessed(packageJson, formatProperty)) {
logger.debug(`Skipping ${entryPoint.name} : ${formatProperty} (already compiled).`);
onTaskCompleted(task, TaskProcessingOutcome.AlreadyProcessed);
return;
}
const bundle = makeEntryPointBundle( const bundle = makeEntryPointBundle(
fileSystem, entryPoint, formatPath, isCore, format, processDts, pathMappings, true, fileSystem, entryPoint, formatPath, isCore, format, processDts, pathMappings, true,
enableI18nLegacyMessageIdFormat); enableI18nLegacyMessageIdFormat);

9
packages/compiler-cli/ngcc/test/execution/cluster/worker_spec.ts
View File

@ -58,15 +58,8 @@ describe('ClusterWorker', () => {
new ClusterWorker(mockLogger, createCompileFnSpy); new ClusterWorker(mockLogger, createCompileFnSpy);
const onTaskCompleted: TaskCompletedCallback = createCompileFnSpy.calls.argsFor(0)[0]; const onTaskCompleted: TaskCompletedCallback = createCompileFnSpy.calls.argsFor(0)[0];
onTaskCompleted(null as any, TaskProcessingOutcome.AlreadyProcessed);
expect(processSendSpy).toHaveBeenCalledTimes(1);
expect(processSendSpy).toHaveBeenCalledWith({
type: 'task-completed',
outcome: TaskProcessingOutcome.AlreadyProcessed,
});
onTaskCompleted(null as any, TaskProcessingOutcome.Processed); onTaskCompleted(null as any, TaskProcessingOutcome.Processed);
expect(processSendSpy).toHaveBeenCalledTimes(2); expect(processSendSpy).toHaveBeenCalledTimes(1);
expect(processSendSpy).toHaveBeenCalledWith({ expect(processSendSpy).toHaveBeenCalledWith({
type: 'task-completed', type: 'task-completed',
outcome: TaskProcessingOutcome.Processed, outcome: TaskProcessingOutcome.Processed,