@overkill-dev/run 0.0.49 → 0.0.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/engine/case-execution.d.ts.map +1 -1
- package/engine/case-execution.js +19 -13
- package/engine/case-execution.js.map +1 -1
- package/engine/execution-async-leak-policy.d.ts.map +1 -1
- package/engine/execution-async-leak-policy.js +2 -1
- package/engine/execution-async-leak-policy.js.map +1 -1
- package/engine/execution-options.d.ts +4 -1
- package/engine/execution-options.d.ts.map +1 -1
- package/engine/execution-options.js +18 -10
- package/engine/execution-options.js.map +1 -1
- package/engine/execution-result.js +3 -2
- package/engine/execution-result.js.map +1 -1
- package/engine/execution-supervision.d.ts.map +1 -1
- package/engine/execution-supervision.js +18 -13
- package/engine/execution-supervision.js.map +1 -1
- package/engine/execution.d.ts.map +1 -1
- package/engine/execution.js +4 -2
- package/engine/execution.js.map +1 -1
- package/engine/run-result.d.ts +5 -0
- package/engine/run-result.d.ts.map +1 -1
- package/engine/run-result.js +6 -0
- package/engine/run-result.js.map +1 -1
- package/package.json +4 -1
- package/packages/engine/engine.entry-point.d.ts +2 -1
- package/packages/engine/engine.entry-point.d.ts.map +1 -1
- package/packages/engine/engine.entry-point.js.map +1 -1
- package/readme.md +5 -3
- package/run/collected-run-plan.js +22 -2
- package/run/collected-run-plan.js.map +1 -1
- package/run/command-line-command.d.ts +1 -0
- package/run/command-line-command.d.ts.map +1 -1
- package/run/command-line-command.js +1 -1
- package/run/command-line-command.js.map +1 -1
- package/run/command-line-runner.js +1 -1
- package/run/command-line-runner.js.map +1 -1
- package/run/duration-history.d.ts +26 -0
- package/run/duration-history.d.ts.map +1 -0
- package/run/duration-history.js +344 -0
- package/run/duration-history.js.map +1 -0
- package/run/node-worker-pool-factory.js +31 -0
- package/run/node-worker-pool-factory.js.map +1 -1
- package/run/run-collected-planning.js +60 -0
- package/run/run-collected-planning.js.map +1 -0
- package/run/run-collected-resolution.js +10 -40
- package/run/run-collected-resolution.js.map +1 -1
- package/run/run-collection-error-result.js +1 -0
- package/run/run-collection-error-result.js.map +1 -1
- package/run/run-config-schema.d.ts +3 -3
- package/run/run-config-schema.d.ts.map +1 -1
- package/run/run-config-schema.js +1 -0
- package/run/run-config-schema.js.map +1 -1
- package/run/run-empty-shard.js +44 -0
- package/run/run-empty-shard.js.map +1 -0
- package/run/run-errors.d.ts +0 -1
- package/run/run-errors.d.ts.map +1 -1
- package/run/run-errors.js +0 -3
- package/run/run-errors.js.map +1 -1
- package/run/run-facts.js +4 -1
- package/run/run-facts.js.map +1 -1
- package/run/run-if-main-facts.js +3 -1
- package/run/run-if-main-facts.js.map +1 -1
- package/run/run-in-process-execution.js +15 -0
- package/run/run-in-process-execution.js.map +1 -0
- package/run/run-isolated-process.js +157 -0
- package/run/run-isolated-process.js.map +1 -0
- package/run/run-list-renderer.js +4 -1
- package/run/run-list-renderer.js.map +1 -1
- package/run/run-local-execution.js +37 -0
- package/run/run-local-execution.js.map +1 -0
- package/run/run-local-resolution.js +50 -5
- package/run/run-local-resolution.js.map +1 -1
- package/run/run-local-sharding.js +15 -0
- package/run/run-local-sharding.js.map +1 -0
- package/run/run-orchestrator-dependencies.d.ts +2 -0
- package/run/run-orchestrator-dependencies.d.ts.map +1 -1
- package/run/run-orchestrator.d.ts.map +1 -1
- package/run/run-orchestrator.js +2 -1
- package/run/run-orchestrator.js.map +1 -1
- package/run/run-shard-hash-algorithm.js +2 -0
- package/run/run-shard-hash-algorithm.js.map +1 -0
- package/run/run-sharding.js +93 -0
- package/run/run-sharding.js.map +1 -0
- package/run/run-support.js +7 -0
- package/run/run-support.js.map +1 -1
- package/run/run-types.d.ts +30 -1
- package/run/run-types.d.ts.map +1 -1
- package/run/run-types.js.map +1 -1
- package/run/run-validation.js +9 -3
- package/run/run-validation.js.map +1 -1
- package/run/run.js +10 -151
- package/run/run.js.map +1 -1
- package/run/supervised-child.js +1 -0
- package/run/supervised-child.js.map +1 -1
- package/run/supervised-run-runtime.js +26 -15
- package/run/supervised-run-runtime.js.map +1 -1
- package/run/supervised-run-state.d.ts +7 -3
- package/run/supervised-run-state.d.ts.map +1 -1
- package/run/supervised-run-state.js +8 -7
- package/run/supervised-run-state.js.map +1 -1
- package/run/supervised-run.js +19 -9
- package/run/supervised-run.js.map +1 -1
- package/run/work-unit-planning.js +22 -38
- package/run/work-unit-planning.js.map +1 -1
- package/run/worker-pool-execution.js +6 -6
- package/run/worker-pool-execution.js.map +1 -1
- package/run/worker-pool-lanes.js +21 -16
- package/run/worker-pool-lanes.js.map +1 -1
- package/run/worker-pool-lifecycle-lanes.js +9 -9
- package/run/worker-pool-lifecycle-lanes.js.map +1 -1
- package/run/worker-pool-placement-planning.js +44 -0
- package/run/worker-pool-placement-planning.js.map +1 -0
- package/run/worker-pool-results.js +29 -2
- package/run/worker-pool-results.js.map +1 -1
- package/run/worker-pool-run.js +19 -8
- package/run/worker-pool-run.js.map +1 -1
- package/run/worker-pool-runtime.js +2 -1
- package/run/worker-pool-runtime.js.map +1 -1
- package/run/worker-pool-worker-plan.js +3 -2
- package/run/worker-pool-worker-plan.js.map +1 -1
- package/sbom.cdx.json +21 -4
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { createResultFromResolutionError, reportCollectionErrorResult } from "./run-collection-error-result.js";
|
|
2
|
+
import { createResolvedRunFromCollection } from "./run-collected-resolution.js";
|
|
3
|
+
import { readResolvedRunInput } from "./run-input-resolution.js";
|
|
4
|
+
import { createSupervisedCollectCommand, createSupervisedRunCommand, createWorkerPoolCommand } from "./run-isolated-command.js";
|
|
5
|
+
import { finalizeResultWithDurationHistory, readRunDurationHistory } from "./run-support.js";
|
|
6
|
+
import { collectSupervisedRun, executeSupervisedRun, runSupervisedCommand } from "./supervised-run.js";
|
|
7
|
+
import { collectWorkerPoolRun, executeWorkerPoolRun, runWorkerPoolCommand } from "./worker-pool-run.js";
|
|
8
|
+
async function createResolvedExecutionRun(resolution) {
|
|
9
|
+
return await createResolvedRunFromCollection({
|
|
10
|
+
allowEmptySelection: resolution.allowEmptySelection,
|
|
11
|
+
collection: resolution.collection,
|
|
12
|
+
command: resolution.command,
|
|
13
|
+
config: resolution.input.config,
|
|
14
|
+
dependencies: resolution.dependencies,
|
|
15
|
+
durationHistoryIndex: resolution.durationHistoryIndex,
|
|
16
|
+
engine: resolution.input.engine,
|
|
17
|
+
files: resolution.input.files,
|
|
18
|
+
planKind: resolution.planKind,
|
|
19
|
+
profile: resolution.input.profile,
|
|
20
|
+
projectRoot: resolution.input.projectRoot,
|
|
21
|
+
request: resolution.input.request
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
async function readWorkerPoolDurationHistory(input, dependencies) {
|
|
25
|
+
const durationHistoryEnabled = input.profile.execution.processModel === 'worker-pool' &&
|
|
26
|
+
input.profile.execution.assignmentPolicy === 'duration-history-balanced';
|
|
27
|
+
if (!durationHistoryEnabled) {
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
return await readRunDurationHistory(dependencies, input.projectRoot, input.config.runtimeStateDir);
|
|
31
|
+
}
|
|
32
|
+
async function createWorkerPoolResolvedRun(command, dependencies, input) {
|
|
33
|
+
const collection = await collectWorkerPoolRun(createWorkerPoolCommand(command, input.profile, input.files), dependencies);
|
|
34
|
+
const durationHistoryIndex = await readWorkerPoolDurationHistory(input, dependencies);
|
|
35
|
+
return await createResolvedExecutionRun({
|
|
36
|
+
allowEmptySelection: false,
|
|
37
|
+
collection,
|
|
38
|
+
command,
|
|
39
|
+
dependencies,
|
|
40
|
+
durationHistoryIndex,
|
|
41
|
+
input,
|
|
42
|
+
planKind: 'worker-pool'
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
async function createSupervisedResolvedRun(command, dependencies, input) {
|
|
46
|
+
const collection = await collectSupervisedRun(createSupervisedCollectCommand(command, input.profile, input.files), dependencies);
|
|
47
|
+
return await createResolvedExecutionRun({
|
|
48
|
+
allowEmptySelection: false,
|
|
49
|
+
collection,
|
|
50
|
+
command,
|
|
51
|
+
dependencies,
|
|
52
|
+
durationHistoryIndex: null,
|
|
53
|
+
input,
|
|
54
|
+
planKind: 'supervised'
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
export function createIsolatedResolvedRun(command, dependencies, input) {
|
|
58
|
+
if (input.profile.execution.processModel === 'supervised-process') {
|
|
59
|
+
return createSupervisedResolvedRun(command, dependencies, input);
|
|
60
|
+
}
|
|
61
|
+
if (input.profile.execution.processModel === 'worker-pool') {
|
|
62
|
+
return createWorkerPoolResolvedRun(command, dependencies, input);
|
|
63
|
+
}
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
function addRunnerErrors(result, runnerErrors) {
|
|
67
|
+
if (runnerErrors.length === 0) {
|
|
68
|
+
return result;
|
|
69
|
+
}
|
|
70
|
+
return {
|
|
71
|
+
...result,
|
|
72
|
+
runnerErrors: [...runnerErrors, ...result.runnerErrors],
|
|
73
|
+
status: 'failed'
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
async function createSupervisedRunResult(command, dependencies) {
|
|
77
|
+
const input = await readResolvedRunInput(command, dependencies);
|
|
78
|
+
if (input.profile.execution.processModel !== 'supervised-process') {
|
|
79
|
+
throw new Error('Expected supervised-process profile.');
|
|
80
|
+
}
|
|
81
|
+
try {
|
|
82
|
+
return await runSupervisedCommand(createSupervisedRunCommand(command, input.profile, input.files), dependencies, async function createResolvedRunAfterCollection(collection) {
|
|
83
|
+
return await createResolvedExecutionRun({
|
|
84
|
+
allowEmptySelection: true,
|
|
85
|
+
collection,
|
|
86
|
+
command,
|
|
87
|
+
dependencies,
|
|
88
|
+
durationHistoryIndex: null,
|
|
89
|
+
input,
|
|
90
|
+
planKind: 'supervised'
|
|
91
|
+
});
|
|
92
|
+
}, {
|
|
93
|
+
async finalizeResult(resolvedRun, result) {
|
|
94
|
+
return await finalizeResultWithDurationHistory(dependencies, resolvedRun, result);
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
catch (error) {
|
|
99
|
+
return await reportCollectionErrorResult(command, dependencies, createResultFromResolutionError(error, null));
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
async function createWorkerPoolRunResult(command, dependencies) {
|
|
103
|
+
const input = await readResolvedRunInput(command, dependencies);
|
|
104
|
+
if (input.profile.execution.processModel !== 'worker-pool') {
|
|
105
|
+
throw new Error('Expected worker-pool profile.');
|
|
106
|
+
}
|
|
107
|
+
try {
|
|
108
|
+
const durationHistoryIndex = await readWorkerPoolDurationHistory(input, dependencies);
|
|
109
|
+
return await runWorkerPoolCommand(createWorkerPoolCommand(command, input.profile, input.files), dependencies, async function createResolvedRunAfterCollection(collection) {
|
|
110
|
+
return await createResolvedExecutionRun({
|
|
111
|
+
allowEmptySelection: true,
|
|
112
|
+
collection,
|
|
113
|
+
command,
|
|
114
|
+
dependencies,
|
|
115
|
+
durationHistoryIndex,
|
|
116
|
+
input,
|
|
117
|
+
planKind: 'worker-pool'
|
|
118
|
+
});
|
|
119
|
+
}, {
|
|
120
|
+
async finalizeResult(resolvedRun, result) {
|
|
121
|
+
return await finalizeResultWithDurationHistory(dependencies, resolvedRun, result);
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
return await reportCollectionErrorResult(command, dependencies, createResultFromResolutionError(error, null));
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
export function runIsolatedProcessCommand(command, dependencies) {
|
|
130
|
+
const processModel = command.config.profiles[command.request.profile]?.execution.processModel;
|
|
131
|
+
if (processModel === 'supervised-process') {
|
|
132
|
+
return createSupervisedRunResult(command, dependencies);
|
|
133
|
+
}
|
|
134
|
+
if (processModel === 'worker-pool') {
|
|
135
|
+
return createWorkerPoolRunResult(command, dependencies);
|
|
136
|
+
}
|
|
137
|
+
return null;
|
|
138
|
+
}
|
|
139
|
+
export async function executeNonLocalResolvedRun(resolvedRun, dependencies, runtimePolicy) {
|
|
140
|
+
if (resolvedRun.facts.execution.processModel === 'supervised-process') {
|
|
141
|
+
const result = await executeSupervisedRun(resolvedRun, dependencies, {
|
|
142
|
+
async finalizeResult(supervisedRun, finalResult) {
|
|
143
|
+
return await finalizeResultWithDurationHistory(dependencies, supervisedRun, finalResult);
|
|
144
|
+
}
|
|
145
|
+
});
|
|
146
|
+
return addRunnerErrors(result, runtimePolicy?.takeRunErrors() ?? []);
|
|
147
|
+
}
|
|
148
|
+
if (resolvedRun.facts.execution.processModel === 'worker-pool') {
|
|
149
|
+
return await executeWorkerPoolRun(resolvedRun, dependencies, {
|
|
150
|
+
async finalizeResult(workerPoolRun, result) {
|
|
151
|
+
return await finalizeResultWithDurationHistory(dependencies, workerPoolRun, result);
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
return null;
|
|
156
|
+
}
|
|
157
|
+
//# sourceMappingURL=run-isolated-process.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-isolated-process.js","sourceRoot":"","sources":["../../../../source/run/run-isolated-process.ts"],"names":[],"mappings":"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"}
|
package/run/run-list-renderer.js
CHANGED
|
@@ -124,8 +124,11 @@ function renderOrphans(orphans, options, context) {
|
|
|
124
124
|
})
|
|
125
125
|
];
|
|
126
126
|
}
|
|
127
|
+
function hasCollectedPlan(plan) {
|
|
128
|
+
return Object.hasOwn(plan, 'collectedPlan');
|
|
129
|
+
}
|
|
127
130
|
function resolvedCollectedPlan(resolvedRun) {
|
|
128
|
-
if (resolvedRun.plan
|
|
131
|
+
if (hasCollectedPlan(resolvedRun.plan)) {
|
|
129
132
|
return resolvedRun.plan.collectedPlan;
|
|
130
133
|
}
|
|
131
134
|
return collectedRunPlanFromTestPlan(resolvedRun.plan.testPlan);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-list-renderer.js","sourceRoot":"","sources":["../../../../source/run/run-list-renderer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-list-renderer.js","sourceRoot":"","sources":["../../../../source/run/run-list-renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { finalizeResultWithDurationHistory, createRunResourceRuntimePolicy } from "./run-support.js";
|
|
2
|
+
function currentRunStartTime(dependencies) {
|
|
3
|
+
const startedAt = new Date(dependencies.wallClock.currentTimestampInMilliseconds);
|
|
4
|
+
return startedAt.toISOString();
|
|
5
|
+
}
|
|
6
|
+
function resolveEngineExecutionMode(scheduling) {
|
|
7
|
+
return scheduling === 'concurrent' ? 'concurrent-in-process' : 'serial-in-process';
|
|
8
|
+
}
|
|
9
|
+
function createExecutionResourceUsageTracker(policy, dependencies) {
|
|
10
|
+
if (!policy.measure) {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
return dependencies.createResourceUsageTracker({
|
|
14
|
+
samplingIntervalMilliseconds: policy.samplingIntervalMilliseconds
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
export async function executeLocalResolvedRun(resolvedRun, dependencies, runtimePolicy) {
|
|
18
|
+
const { resourceUsagePolicy } = resolvedRun.facts.execution;
|
|
19
|
+
return await dependencies.execute(resolvedRun.plan.testPlan, {
|
|
20
|
+
execution: { mode: resolveEngineExecutionMode(resolvedRun.facts.execution.scheduling) },
|
|
21
|
+
outputRenderer: resolvedRun.config.outputRenderer,
|
|
22
|
+
async finalizeResult(result) {
|
|
23
|
+
return await finalizeResultWithDurationHistory(dependencies, resolvedRun, result);
|
|
24
|
+
},
|
|
25
|
+
reporters: resolvedRun.reporters,
|
|
26
|
+
resourceBudgets: resourceUsagePolicy.budgets,
|
|
27
|
+
resourceUsageTracker: createExecutionResourceUsageTracker(resourceUsagePolicy, dependencies),
|
|
28
|
+
runtimePolicy: createRunResourceRuntimePolicy(resolvedRun.plan.testPlan.cases, runtimePolicy),
|
|
29
|
+
runFacts: resolvedRun.facts,
|
|
30
|
+
startedAt: currentRunStartTime(dependencies),
|
|
31
|
+
timeoutPolicy: {
|
|
32
|
+
hardTimeoutMilliseconds: resolvedRun.facts.execution.timeoutPolicy.hardMilliseconds,
|
|
33
|
+
timeoutMilliseconds: resolvedRun.facts.execution.timeoutPolicy.softMilliseconds
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=run-local-execution.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-local-execution.js","sourceRoot":"","sources":["../../../../source/run/run-local-execution.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,iCAAiC,EACjC,8BAA8B,EAEjC,MAAM,kBAAkB,CAAC;AAiB1B,SAAS,mBAAmB,CAAC,YAAyC;IAClE,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;IAElF,OAAO,SAAS,CAAC,WAAW,EAAE,CAAC;AACnC,CAAC;AAED,SAAS,0BAA0B,CAAC,UAAyB;IACzD,OAAO,UAAU,KAAK,YAAY,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,mBAAmB,CAAC;AACvF,CAAC;AAED,SAAS,mCAAmC,CACxC,MAA8B,EAC9B,YAAyC;IAEzC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,YAAY,CAAC,0BAA0B,CAAC;QAC3C,4BAA4B,EAAE,MAAM,CAAC,4BAA4B;KACpE,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,WAA6B,EAC7B,YAAyC,EACzC,aAAsC;IAEtC,MAAM,EAAE,mBAAmB,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC;IAE5D,OAAO,MAAM,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE;QACzD,SAAS,EAAE,EAAE,IAAI,EAAE,0BAA0B,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;QACvF,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,cAAc;QACjD,KAAK,CAAC,cAAc,CAAC,MAAM;YACvB,OAAO,MAAM,iCAAiC,CAAC,YAAY,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QACtF,CAAC;QACD,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,eAAe,EAAE,mBAAmB,CAAC,OAAO;QAC5C,oBAAoB,EAAE,mCAAmC,CAAC,mBAAmB,EAAE,YAAY,CAAC;QAC5F,aAAa,EAAE,8BAA8B,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;QAC7F,QAAQ,EAAE,WAAW,CAAC,KAAK;QAC3B,SAAS,EAAE,mBAAmB,CAAC,YAAY,CAAC;QAC5C,aAAa,EAAE;YACX,uBAAuB,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB;YACnF,mBAAmB,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB;SAClF;KACJ,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { createRunFacts, runCaseFactsFromTestPlan } from "./run-facts.js";
|
|
2
|
-
import {
|
|
2
|
+
import { createRunResultFromCollectedPlan, collectedRunPlanFromTestPlanCases } from "./collected-run-plan.js";
|
|
3
3
|
import { readResolvedRunInput } from "./run-input-resolution.js";
|
|
4
4
|
import { createLocalTestPlan } from "./run-local-test-plan.js";
|
|
5
|
+
import { shardedLocalCases } from "./run-local-sharding.js";
|
|
5
6
|
import { orderedTestPlan, assertTestPlanMatchesTestFamily, assertTestPlanCasesMatchProfilePolicy, selectedNonEmptyTestPlanCases, selectedTestPlan } from "./run-selection.js";
|
|
6
7
|
import { freezeValue, resolveRunReporters } from "./run-support.js";
|
|
7
8
|
function fileSetForDiscoveredFiles(files) {
|
|
@@ -19,6 +20,7 @@ function createLocalResolvedRunFromTestPlan(command, dependencies, input, planne
|
|
|
19
20
|
cases: runCaseFactsFromTestPlan(plannedTestPlan, fileSetForDiscoveredFiles(input.files)),
|
|
20
21
|
config: input.config,
|
|
21
22
|
dependencies,
|
|
23
|
+
durationHistory: null,
|
|
22
24
|
engine: input.engine,
|
|
23
25
|
placementPlan: null,
|
|
24
26
|
projectRoot: input.projectRoot,
|
|
@@ -38,10 +40,54 @@ function createLocalResolvedRunFromTestPlan(command, dependencies, input, planne
|
|
|
38
40
|
request: input.request
|
|
39
41
|
});
|
|
40
42
|
}
|
|
43
|
+
function createEmptySelectionResult(testPlan, dependencies) {
|
|
44
|
+
const startedAtMs = dependencies.wallClock.currentTimestampInMilliseconds;
|
|
45
|
+
return freezeValue(createRunResultFromCollectedPlan(collectedRunPlanFromTestPlanCases(testPlan, []), [], [], {
|
|
46
|
+
planStatus: 'empty-selection',
|
|
47
|
+
resourceUsage: null,
|
|
48
|
+
startedAtMs,
|
|
49
|
+
wallClock: dependencies.wallClock
|
|
50
|
+
}));
|
|
51
|
+
}
|
|
52
|
+
function createEmptyShardResolvedRunFromTestPlan(command, dependencies, input, selectedPlan) {
|
|
53
|
+
const collectedPlan = collectedRunPlanFromTestPlanCases(selectedPlan, []);
|
|
54
|
+
const facts = freezeValue(createRunFacts({
|
|
55
|
+
cases: [],
|
|
56
|
+
config: input.config,
|
|
57
|
+
dependencies,
|
|
58
|
+
durationHistory: null,
|
|
59
|
+
engine: input.engine,
|
|
60
|
+
placementPlan: null,
|
|
61
|
+
projectRoot: input.projectRoot,
|
|
62
|
+
request: input.request
|
|
63
|
+
}));
|
|
64
|
+
return freezeValue({
|
|
65
|
+
collectionRunnerErrors: [],
|
|
66
|
+
config: input.config,
|
|
67
|
+
cwd: command.cwd,
|
|
68
|
+
engine: input.engine,
|
|
69
|
+
facts,
|
|
70
|
+
plan: {
|
|
71
|
+
collectedPlan,
|
|
72
|
+
kind: 'empty-shard'
|
|
73
|
+
},
|
|
74
|
+
reporters: resolveRunReporters(input.profile, input.config.reporters),
|
|
75
|
+
request: input.request
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
async function createShardedLocalResolvedRunFromTestPlan(command, dependencies, input, selectedPlan) {
|
|
79
|
+
const plannedCases = await shardedLocalCases(selectedPlan, input);
|
|
80
|
+
const firstCase = plannedCases[0];
|
|
81
|
+
if (firstCase === undefined) {
|
|
82
|
+
return createEmptyShardResolvedRunFromTestPlan(command, dependencies, input, selectedPlan);
|
|
83
|
+
}
|
|
84
|
+
const orderedPlan = orderedTestPlan({ ...selectedPlan, cases: [firstCase, ...plannedCases.slice(1)] }, input.request.order, input.request.seed);
|
|
85
|
+
return createLocalResolvedRunFromTestPlan(command, dependencies, input, orderedPlan);
|
|
86
|
+
}
|
|
41
87
|
export async function createLocalResolvedRun(command, dependencies, input) {
|
|
42
88
|
const testPlan = await createLocalTestPlan(command, input.profile, input.files, dependencies);
|
|
43
89
|
const selectedPlan = selectedTestPlan(testPlan, input.request.selection);
|
|
44
|
-
return
|
|
90
|
+
return await createShardedLocalResolvedRunFromTestPlan(command, dependencies, input, selectedPlan);
|
|
45
91
|
}
|
|
46
92
|
export async function createLocalRunOrEmptySelectionResult(command, dependencies) {
|
|
47
93
|
const input = await readResolvedRunInput(command, dependencies);
|
|
@@ -53,10 +99,9 @@ export async function createLocalRunOrEmptySelectionResult(command, dependencies
|
|
|
53
99
|
if (plannedCases === null) {
|
|
54
100
|
return createEmptySelectionResult(testPlan, dependencies);
|
|
55
101
|
}
|
|
56
|
-
|
|
57
|
-
return createLocalResolvedRunFromTestPlan(command, dependencies, input, {
|
|
102
|
+
return await createShardedLocalResolvedRunFromTestPlan(command, dependencies, input, {
|
|
58
103
|
...testPlan,
|
|
59
|
-
cases
|
|
104
|
+
cases: plannedCases
|
|
60
105
|
});
|
|
61
106
|
}
|
|
62
107
|
//# sourceMappingURL=run-local-resolution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-local-resolution.js","sourceRoot":"","sources":["../../../../source/run/run-local-resolution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-local-resolution.js","sourceRoot":"","sources":["../../../../source/run/run-local-resolution.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { workIdentityKey } from "../engine/identity.js";
|
|
2
|
+
import { collectedRunCaseEntries, collectedRunPlanFromTestPlanCases } from "./collected-run-plan.js";
|
|
3
|
+
import { createRunShardHasher, shardCollectedRunCaseEntries } from "./run-sharding.js";
|
|
4
|
+
export async function shardedLocalCases(testPlan, input) {
|
|
5
|
+
const shardHasher = await createRunShardHasher(input.request.shard);
|
|
6
|
+
const entries = shardCollectedRunCaseEntries(collectedRunCaseEntries(collectedRunPlanFromTestPlanCases(testPlan, testPlan.cases)), input.request.shard, shardHasher);
|
|
7
|
+
const casesByKey = new Map(testPlan.cases.map(function toCaseEntry(testCase) {
|
|
8
|
+
return [workIdentityKey(testCase.workId), testCase];
|
|
9
|
+
}));
|
|
10
|
+
return entries.flatMap(function toTestCase(entry) {
|
|
11
|
+
const testCase = casesByKey.get(workIdentityKey(entry.workId));
|
|
12
|
+
return testCase === undefined ? [] : [testCase];
|
|
13
|
+
});
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=run-local-sharding.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-local-sharding.js","sourceRoot":"","sources":["../../../../source/run/run-local-sharding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EACH,uBAAuB,EACvB,iCAAiC,EACpC,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACH,oBAAoB,EACpB,4BAA4B,EAC/B,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACnC,QAAkB,EAClB,KAAuB;IAEvB,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,4BAA4B,CACxC,uBAAuB,CAAC,iCAAiC,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,EACpF,KAAK,CAAC,OAAO,CAAC,KAAK,EACnB,WAAW,CACd,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,WAAW,CAAC,QAAQ;QACvE,OAAO,CAAE,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAE,CAAC;IAC1D,CAAC,CAAC,CAAC,CAAC;IAEJ,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,UAAU,CAAC,KAAK;QAC5C,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAE/D,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,QAAQ,CAAE,CAAC;IACtD,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { WallClock } from '@enormora/wall-clock';
|
|
2
2
|
import type { Engine, Execute, ReporterDispatcher, RunResourceUsageTracker } from '../packages/engine/engine.entry-point.ts';
|
|
3
3
|
import type { RuntimeCapabilityPolicyDependencies, RuntimeCapabilityPolicyEnvironment } from './capability-policy-snapshots.ts';
|
|
4
|
+
import type { DurationHistoryStore } from './duration-history.ts';
|
|
4
5
|
import type { RunDiscovery } from './run-discovery-types.ts';
|
|
5
6
|
import type { RunEngineModuleLoader } from './run-engine-selection.ts';
|
|
6
7
|
import type { RunTestModuleLoader } from './run-test-modules.ts';
|
|
@@ -47,6 +48,7 @@ export type RunOrchestratorDependencies = {
|
|
|
47
48
|
readonly createWorkerPool: (options: WorkerPoolCreationOptions) => CreatedWorkerPool;
|
|
48
49
|
readonly defaultEngine: Engine;
|
|
49
50
|
readonly discoverRunFilesWithProjectRoot: RunDiscovery['discoverRunFilesWithProjectRoot'];
|
|
51
|
+
readonly durationHistoryStore: DurationHistoryStore;
|
|
50
52
|
readonly execute: Execute;
|
|
51
53
|
readonly loadRunEngineModule: RunEngineModuleLoader;
|
|
52
54
|
readonly loadRunTestModules: RunTestModuleLoader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-orchestrator-dependencies.d.ts","sourceRoot":"","sources":["../../../../source/run/run-orchestrator-dependencies.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-orchestrator-dependencies.d.ts","sourceRoot":"","sources":["../../../../source/run/run-orchestrator-dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-orchestrator.d.ts","sourceRoot":"","sources":["../../../../source/run/run-orchestrator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-orchestrator.d.ts","sourceRoot":"","sources":["../../../../source/run/run-orchestrator.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACR,2BAA2B,EAC3B,4BAA4B,EAC/B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMtD,KAAK,4BAA4B,GAAG,2BAA2B,CAAC,yBAAyB,CAAC,CAAC;AAE3F,MAAM,MAAM,wBAAwB,GAAG;IACnC,QAAQ,CAAC,aAAa,EAAE,2BAA2B,CAAC,eAAe,CAAC,CAAC;IACrE,QAAQ,CAAC,+BAA+B,EAAE,2BAA2B,CAAC,iCAAiC,CAAC,CAAC;IACzG,QAAQ,CAAC,qBAAqB,EAAE,4BAA4B,CAAC,uBAAuB,CAAC,CAAC;IACtF,QAAQ,CAAC,kCAAkC,EAAE,4BAA4B,CAAC,oCAAoC,CAAC,CAAC;IAChH,QAAQ,CAAC,IAAI,EAAE,2BAA2B,CAAC,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,eAAe,EAAE,4BAA4B,CAAC,iBAAiB,CAAC,CAAC;IAC1E,QAAQ,CAAC,WAAW,EAAE,4BAA4B,CAAC,aAAa,CAAC,CAAC;IAClE,QAAQ,CAAC,mBAAmB,EAAE,2BAA2B,CAAC,qBAAqB,CAAC,CAAC;IACjF,QAAQ,CAAC,kBAAkB,EAAE,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;IAC/E,QAAQ,CAAC,oBAAoB,EAAE,2BAA2B,CAAC,sBAAsB,CAAC,CAAC;IACnF,QAAQ,CAAC,mBAAmB,EAAE,4BAA4B,CAAC;IAC3D,QAAQ,CAAC,MAAM,EAAE;QACb,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;QAC5C,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;KAC9C,CAAC;IACF,QAAQ,CAAC,MAAM,EAAE;QACb,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;QAC5C,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;KAC9C,CAAC;CACL,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,wBAAwB,GAAG,eAAe,CA4C1F"}
|
package/run/run-orchestrator.js
CHANGED
|
@@ -3,7 +3,7 @@ import { createWallClock } from '@enormora/wall-clock';
|
|
|
3
3
|
import { createExecute } from "../engine/execution.js";
|
|
4
4
|
import { createReporterDispatcher } from "../engine/reporter-dispatcher.js";
|
|
5
5
|
import { createNodeResourceUsageTracker } from "./resource-usage.js";
|
|
6
|
-
import { createWorkerPoolWithHostProcess } from "./node-worker-pool-factory.js";
|
|
6
|
+
import { createNodeDurationHistoryStore, createWorkerPoolWithHostProcess } from "./node-worker-pool-factory.js";
|
|
7
7
|
import { createRunOrchestrator } from "./run.js";
|
|
8
8
|
import { createRandomRunSeed } from "./run-seed.js";
|
|
9
9
|
function readActiveResourceTypes() {
|
|
@@ -23,6 +23,7 @@ export function createNodeRunOrchestrator(input) {
|
|
|
23
23
|
return createNodeResourceUsageTracker(wallClock, options);
|
|
24
24
|
},
|
|
25
25
|
defaultEngine: input.defaultEngine,
|
|
26
|
+
durationHistoryStore: createNodeDurationHistoryStore(),
|
|
26
27
|
createWorkerPool(options) {
|
|
27
28
|
return createWorkerPoolWithHostProcess(options, input.readEnvironment(), input.startWorkerPoolHost);
|
|
28
29
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-orchestrator.js","sourceRoot":"","sources":["../../../../source/run/run-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,
|
|
1
|
+
{"version":3,"file":"run-orchestrator.js","sourceRoot":"","sources":["../../../../source/run/run-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EACH,8BAA8B,EAC9B,+BAA+B,EAClC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAOpD,SAAS,uBAAuB;IAC5B,OAAO,OAAO,CAAC,sBAAsB,EAAE,CAAC;AAC5C,CAAC;AA0BD,MAAM,UAAU,yBAAyB,CAAC,KAA+B;IACrE,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC;IACpC,MAAM,kBAAkB,GAAG,wBAAwB,CAAC;QAChD,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,SAAS;KACZ,CAAC,CAAC;IAEH,OAAO,qBAAqB,CAAC;QACzB,oBAAoB,EAAE,EAAE,CAAC,oBAAoB,EAAE;QAC/C,UAAU,EAAE,mBAAmB;QAC/B,0BAA0B,CAAC,OAAO;YAC9B,OAAO,8BAA8B,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC;QACD,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,oBAAoB,EAAE,8BAA8B,EAAE;QACtD,gBAAgB,CAAC,OAAO;YACpB,OAAO,+BAA+B,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,EAAE,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACxG,CAAC;QACD,+BAA+B,EAAE,KAAK,CAAC,+BAA+B;QACtE,OAAO,EAAE,aAAa,CAAC;YACnB,oBAAoB,EAAE,SAAS;YAC/B,uBAAuB;YACvB,kBAAkB;YAClB,SAAS;SACZ,CAAC;QACF,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;QAC5C,UAAU,EAAE;YACR,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;YACrC,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;SACxC;QACD,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,kBAAkB;QAClB,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;QAChD,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,uBAAuB,EAAE;YACrB,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;YAClD,kCAAkC,EAAE,KAAK,CAAC,kCAAkC;YAC5E,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,WAAW,EAAE,KAAK,CAAC,WAAW;SACjC;QACD,SAAS;KACZ,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-shard-hash-algorithm.js","sourceRoot":"","sources":["../../../../source/run/run-shard-hash-algorithm.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAA0B,2BAA2B,CAAC"}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { collectedRunCaseEntries } from "./collected-run-plan.js";
|
|
2
|
+
import { caseWorkUnitId } from "./work-unit-identity.js";
|
|
3
|
+
function sortedObjectKeys(value) {
|
|
4
|
+
return Object.keys(value).toSorted(function compareKeys(left, right) {
|
|
5
|
+
return left.localeCompare(right);
|
|
6
|
+
});
|
|
7
|
+
}
|
|
8
|
+
function canonicalNumber(value) {
|
|
9
|
+
if (Number.isFinite(value)) {
|
|
10
|
+
return value;
|
|
11
|
+
}
|
|
12
|
+
throw new TypeError('Cannot serialize number value for shard partitioning.');
|
|
13
|
+
}
|
|
14
|
+
function canonicalScalar(value) {
|
|
15
|
+
if (typeof value === 'boolean') {
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
if (typeof value === 'number') {
|
|
19
|
+
return canonicalNumber(value);
|
|
20
|
+
}
|
|
21
|
+
if (typeof value === 'string') {
|
|
22
|
+
return value.normalize('NFC');
|
|
23
|
+
}
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
function isRecord(value) {
|
|
27
|
+
return value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
28
|
+
}
|
|
29
|
+
function canonicalArray(value, canonicalize) {
|
|
30
|
+
return value.map(canonicalize);
|
|
31
|
+
}
|
|
32
|
+
function canonicalRecord(value, canonicalize) {
|
|
33
|
+
return Object.fromEntries(sortedObjectKeys(value).map(function toCanonicalEntry(key) {
|
|
34
|
+
return [key.normalize('NFC'), canonicalize(value[key])];
|
|
35
|
+
}));
|
|
36
|
+
}
|
|
37
|
+
function canonicalJsonValue(value) {
|
|
38
|
+
const scalar = canonicalScalar(value);
|
|
39
|
+
if (scalar !== undefined) {
|
|
40
|
+
return scalar;
|
|
41
|
+
}
|
|
42
|
+
if (value === null) {
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
if (Array.isArray(value)) {
|
|
46
|
+
return canonicalArray(value, canonicalJsonValue);
|
|
47
|
+
}
|
|
48
|
+
if (isRecord(value)) {
|
|
49
|
+
return canonicalRecord(value, canonicalJsonValue);
|
|
50
|
+
}
|
|
51
|
+
throw new TypeError(`Cannot serialize ${typeof value} value for shard partitioning.`);
|
|
52
|
+
}
|
|
53
|
+
function canonicalJson(value) {
|
|
54
|
+
return JSON.stringify(canonicalJsonValue(value));
|
|
55
|
+
}
|
|
56
|
+
function shardIndex(shard) {
|
|
57
|
+
return BigInt(shard.index - 1);
|
|
58
|
+
}
|
|
59
|
+
function shardTotal(shard) {
|
|
60
|
+
return BigInt(shard.total);
|
|
61
|
+
}
|
|
62
|
+
export async function createRunShardHasher(shard) {
|
|
63
|
+
if (shard.total === 1) {
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
const { createXXHash3 } = await import('hash-wasm');
|
|
67
|
+
const hasher = await createXXHash3(0, 0);
|
|
68
|
+
return {
|
|
69
|
+
hash(value) {
|
|
70
|
+
hasher.init();
|
|
71
|
+
hasher.update(value);
|
|
72
|
+
return BigInt(`0x${hasher.digest('hex')}`);
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
export function workUnitBelongsToShard(unit, shard, hasher) {
|
|
77
|
+
if (shard.total === 1) {
|
|
78
|
+
return true;
|
|
79
|
+
}
|
|
80
|
+
if (hasher === null) {
|
|
81
|
+
throw new Error('Sharded planning requires a shard hasher.');
|
|
82
|
+
}
|
|
83
|
+
return hasher.hash(canonicalJson(unit)) % shardTotal(shard) === shardIndex(shard);
|
|
84
|
+
}
|
|
85
|
+
export function shardCollectedRunCaseEntries(entries, shard, hasher) {
|
|
86
|
+
return entries.filter(function caseBelongsToShard(entry) {
|
|
87
|
+
return workUnitBelongsToShard(caseWorkUnitId(entry.workId), shard, hasher);
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
export function shardCollectedRunPlanCases(plan, shard, hasher) {
|
|
91
|
+
return shardCollectedRunCaseEntries(collectedRunCaseEntries(plan), shard, hasher);
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=run-sharding.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-sharding.js","sourceRoot":"","sources":["../../../../source/run/run-sharding.ts"],"names":[],"mappings":"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"}
|
package/run/run-support.js
CHANGED
|
@@ -2,6 +2,13 @@ import { createResourceLifecycleRuntimePolicy } from "./resource-lifecycle.js";
|
|
|
2
2
|
import { createRuntimeCapabilityPolicy } from "./capability-policy.js";
|
|
3
3
|
import { copyRunSelection } from "./run-selection-filters.js";
|
|
4
4
|
import { validateRunResourceUsagePolicy } from "./run-validation.js";
|
|
5
|
+
import { readDurationHistoryIndex, resultWithUpdatedDurationHistory } from "./duration-history.js";
|
|
6
|
+
export async function readRunDurationHistory(dependencies, projectRoot, runtimeStateDir) {
|
|
7
|
+
return await readDurationHistoryIndex(dependencies.durationHistoryStore, projectRoot, runtimeStateDir);
|
|
8
|
+
}
|
|
9
|
+
export async function finalizeResultWithDurationHistory(dependencies, resolvedRun, result) {
|
|
10
|
+
return await resultWithUpdatedDurationHistory(dependencies.durationHistoryStore, resolvedRun, result, dependencies.wallClock.currentTimestampInMilliseconds);
|
|
11
|
+
}
|
|
5
12
|
function composeRunRuntimePolicies(firstPolicy, secondPolicy) {
|
|
6
13
|
if (firstPolicy === null) {
|
|
7
14
|
return secondPolicy;
|