Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/common/plugin/LocalExecutor.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ define([
var LocalExecutor = function() {
};

// Should these be in lua?
LocalExecutor.prototype[CONSTANTS.OP.INPUT] = function(node) {
// Get the hash from the output node
var hash;
Expand Down Expand Up @@ -153,12 +152,14 @@ define([
newName = this.core.getOwnAttribute(node, 'saveName'),
createdAt = Date.now();

if (newName) {
newNodes.forEach(node => {
this.setAttribute(node, 'name', newName);
this.setAttribute(node, 'createdAt', createdAt);
});
}
newNodes.forEach(newNode => {
if (newName) {
this.setAttribute(newNode, 'name', newName);
}
this.setAttribute(newNode, 'createdAt', createdAt);
this.setPointer(newNode, 'origin', inputs[0][2]);
});

var hashes = dataNodes.map(n => this.getAttribute(n, 'data'));
this.logger.info(`saving hashes: ${hashes.map(h => `"${h}"`)}`);
} else if (allDataNodes.length === 0) {
Expand Down
6 changes: 4 additions & 2 deletions src/plugins/ExecutePipeline/ExecutePipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ define([
.then(ops => ops.forEach(op => this.updateJobCompletionRecords(op)))
.then(() => this.save(`Resuming pipeline execution: ${name}`))
.then(() => {

if (jobs.running.length) { // Resume all running jobs
return Q.all(jobs.running.map(job => this.resumeJob(job)));
} else if (this.completedCount === this.totalCount) {
Expand Down Expand Up @@ -547,7 +547,7 @@ define([

hasReadyOps = counts.indexOf(0) > -1;

this.logger.debug(`Operation "${name}" completed. ` +
this.logger.debug(`Operation "${name}" completed. ` +
`${this.totalCount - this.completedCount} remaining.`);
if (hasReadyOps) {
this.executeReadyOperations();
Expand Down Expand Up @@ -582,6 +582,8 @@ define([
let hash = this.getAttribute(result, 'data');
this.setAttribute(next, 'data', hash);

this.setPointer(next, 'origin', result);

this.logger.info(`forwarding data (${dataType}) from ${this.core.getPath(result)} ` +
`to ${this.core.getPath(next)}`);

Expand Down
Binary file modified src/seeds/pipeline/pipeline.webgmex
Binary file not shown.
2 changes: 1 addition & 1 deletion src/seeds/pipeline/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.0
0.10.0