Repository: incubator-ignite Updated Branches: refs/heads/ignite-965 f981f3a0c -> e1c097fa2
#ignite-965: map/reduce task for all nodes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39cd83e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39cd83e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39cd83e0 Branch: refs/heads/ignite-965 Commit: 39cd83e011ef974ef32e0feda74871493a1482ba Parents: f981f3a Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Jun 24 17:31:19 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Jun 24 17:31:19 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/NodeJsComputeSelfTest.java | 2 +- modules/nodejs/src/test/js/test-compute.js | 31 ++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39cd83e0/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java index 0015025..2ba5e63 100644 --- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java +++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java @@ -91,7 +91,7 @@ public class NodeJsComputeSelfTest extends NodeJsAbstractTest { }, 2, "runIgnite"); while (!fut.isDone()) - runJsScript("testComputeExecute"); + runJsScript("testComputeAllNodeExecute"); stopGrid(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39cd83e0/modules/nodejs/src/test/js/test-compute.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/js/test-compute.js b/modules/nodejs/src/test/js/test-compute.js index d883e18..80f0900 100644 --- a/modules/nodejs/src/test/js/test-compute.js +++ b/modules/nodejs/src/test/js/test-compute.js @@ -31,6 +31,10 @@ testComputeErrorExecute = function() { TestUtils.startIgniteNode(computeErrorExecute); } +testComputeAllNodeExecute = function() { + TestUtils.startIgniteNode(computeAllNodeExecute); +} + function onStart(onPut, error, ignite) { var cache = ignite.cache("mycache"); @@ -86,8 +90,8 @@ function computeExecute(error, ignite) { }; var callback = function(err, res) { - assert(err == null, "Get error on compute task. [err=" + err + "]."); - assert(res === 7, "Result is not correct. [expected=7, value=" + res + "]."); + assert(err == null, "Get error on compute task [err=" + err + "]"); + assert.equal(res, 7); TestUtils.testDone(); } @@ -95,6 +99,29 @@ function computeExecute(error, ignite) { ignite.compute().execute(map, reduce, "Hi Alice", callback); } +function computeAllNodeExecute(error, ignite) { + var map = function(nodes, arg) { + for (var i = 0; i < nodes.length; i++) { + var f = function (node) { + println(">>> Printing " + node.id().toString()); + + return ""; + }; + + emit(f, nodes[i % nodes.length], nodes[i % nodes.length]); + } + }; + + var reduce = function(results) {}; + + var callback = function(err, res) { + assert(err == null, "Get error on compute task. [err=" + err + "]."); + TestUtils.testDone(); + } + + ignite.compute().execute(map, reduce, "", callback); +} + function computeErrorExecute(error, ignite) { var map = function(nodes, arg) { var f = [function (args) {}, function(args){throw "Bad function";}];