admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 02:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): Change node execution order (most top-left one first) (#6246)

Browse Source 
* feat(core): Change node execution order (most top-left one first)

* ⚡ Fix issue with multi-output-nodes

* ⚡ Remove not needed meta-entry in test

* fix the e2e test

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
Jan Oberhauser
2023-06-19 19:32:11 +02:00
committed by कारतोफ्फेलस्क्रिप्ट™
parent 0fe415add2
commit 0287d5becd
7 changed files with 607 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
packages/core/src/WorkflowExecute.ts
View File

@@ -451,7 +451,7 @@ export class WorkflowExecute {
];
}
this.runExecutionData.executionData!.nodeExecutionStack.push(executionStackItem);
this.runExecutionData.executionData!.nodeExecutionStack.unshift(executionStackItem);
// Remove the data from waiting
delete this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex];
@@ -609,7 +609,7 @@ export class WorkflowExecute {
if (addEmptyItem) {
// Add only node if it does not have any inputs because else it will
// be added by its input node later anyway.
this.runExecutionData.executionData!.nodeExecutionStack.push({
this.runExecutionData.executionData!.nodeExecutionStack.unshift({
node: workflow.getNode(nodeToAdd) as INode,
data: {
main: [
@@ -661,7 +661,7 @@ export class WorkflowExecute {
};
} else {
// All data is there so add it directly to stack
this.runExecutionData.executionData!.nodeExecutionStack.push({
this.runExecutionData.executionData!.nodeExecutionStack.unshift({
node: workflow.nodes[connectionData.node],
data: {
main: connectionDataArray,
@@ -1180,6 +1180,12 @@ export class WorkflowExecute {
let connectionData: IConnection;
// Iterate over all the outputs
const nodesToAdd: Array<{
position: [number, number];
connection: IConnection;
outputIndex: number;
}> = [];
// Add the nodes to be executed
// eslint-disable-next-line @typescript-eslint/no-for-in-array
for (outputIndex in workflow.connectionsBySourceNode[executionNode.name].main) {
@@ -1206,17 +1212,42 @@ export class WorkflowExecute {
(nodeSuccessData![outputIndex].length !== 0 || connectionData.index > 0)
) {
// Add the node only if it did execute or if connected to second "optional" input
this.addNodeToBeExecuted(
workflow,
connectionData,
parseInt(outputIndex, 10),
executionNode.name,
nodeSuccessData!,
runIndex,
);
const nodeToAdd = workflow.getNode(connectionData.node);
nodesToAdd.push({
position: nodeToAdd?.position || [0, 0],
connection: connectionData,
outputIndex: parseInt(outputIndex, 10),
});
}
}
}
// Always execute the node that is more to the top-left first
nodesToAdd.sort((a, b) => {
if (a.position[1] < b.position[1]) {
return 1;
}
if (a.position[1] > b.position[1]) {
return -1;
}
if (a.position[0] > b.position[0]) {
return -1;
}
return 0;
});
for (const nodeData of nodesToAdd) {
this.addNodeToBeExecuted(
workflow,
nodeData.connection,
nodeData.outputIndex,
executionNode.name,
nodeSuccessData!,
runIndex,
);
}
}
}