Repository: incubator-ignite Updated Branches: refs/heads/ignite-961 23f41599b -> fb67ebcfc
#ignite-961: small fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb67ebcf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb67ebcf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb67ebcf Branch: refs/heads/ignite-961 Commit: fb67ebcfcf0f7875b6737252483afcab92e128f8 Parents: 23f4159 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jun 8 23:42:06 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jun 8 23:42:06 2015 +0300 ---------------------------------------------------------------------- modules/nodejs/src/main/js/cache.js | 17 +++++------ modules/nodejs/src/main/js/ignition.js | 35 ++++++++--------------- modules/nodejs/src/main/js/server.js | 9 +++--- modules/nodejs/src/test/js/test-cache-api.js | 19 ++++++------ 4 files changed, 32 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb67ebcf/modules/nodejs/src/main/js/cache.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/main/js/cache.js b/modules/nodejs/src/main/js/cache.js index 3c1c176..bf4089b 100644 --- a/modules/nodejs/src/main/js/cache.js +++ b/modules/nodejs/src/main/js/cache.js @@ -98,16 +98,16 @@ Cache.prototype.removeAll = function(keys, callback) { * Put keys to cache * * @this {Cache} - * @param {string[]} keys Keys - * @param {string[]} values Values + * @param {Object.<string, string>} collection of entries to put in the cache * @param {Cache~noValue} callback Called on finish */ -Cache.prototype.putAll = function(keys, values, callback) { - if (keys.length !== values.length) { - callback.call(null, "Number of keys is not equal to number of values." + - "keys size=" + keys.length + ", values size=" + values.length + "]."); +Cache.prototype.putAll = function(map, callback) { + var keys = Object.keys(map); + + var values = []; - return; + for (var key of keys) { + values.push(map[key]); } var params = Cache.concatParams("k", keys); @@ -137,9 +137,6 @@ Cache.prototype.getAll = function(keys, callback) { params.push(this._cacheNameParam); - - console.log("PARAM GET ALL "+ params); - this._server.runCommand("getall", params, callback); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb67ebcf/modules/nodejs/src/main/js/ignition.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/main/js/ignition.js b/modules/nodejs/src/main/js/ignition.js index 6a9070d..fb98562 100644 --- a/modules/nodejs/src/main/js/ignition.js +++ b/modules/nodejs/src/main/js/ignition.js @@ -48,37 +48,26 @@ Ignition.start = function(address, callback) { var portsRange = params[1].split(".."); - if (portsRange.length === 1) { - var port = parseInt(portsRange[0], 10); - - if (isNaN(port)) { - incorrectAddress(); - - return; - } + var start; + var end; - checkServer(params[0], port); + if (portsRange.length === 1) { + start = parseInt(portsRange[0], 10); + end = start; } else if (portsRange.length === 2) { - var start = parseInt(portsRange[0], 10); - - var end = parseInt(portsRange[1], 10); - - if (isNaN(start) || isNaN(end)) { - incorrectAddress(); - - return; - } - - for (var i = start; i <= end; i++) { - checkServer(params[0], i); - } + start = parseInt(portsRange[0], 10); + end = parseInt(portsRange[1], 10); } - else { + if (isNaN(start) || isNaN(end)) { incorrectAddress(); return; } + + for (var i = start; i <= end; i++) { + checkServer(params[0], i); + } } function checkServer(host, port) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb67ebcf/modules/nodejs/src/main/js/server.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/main/js/server.js b/modules/nodejs/src/main/js/server.js index 3fd2f3c..99c3531 100644 --- a/modules/nodejs/src/main/js/server.js +++ b/modules/nodejs/src/main/js/server.js @@ -84,13 +84,12 @@ Server.prototype.runCommand = function(cmdName, params, callback) { if (response.successStatus) { callback.call(null, response.error, null) - } else { - + } + else { callback.call(null, null, response.response); } - } catch (e) { - console.log("fail on json parse: " + fullResponseString); - + } + catch (e) { callback.call(null, e, null); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb67ebcf/modules/nodejs/src/test/js/test-cache-api.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/js/test-cache-api.js b/modules/nodejs/src/test/js/test-cache-api.js index ea9e155..9b513c4 100644 --- a/modules/nodejs/src/test/js/test-cache-api.js +++ b/modules/nodejs/src/test/js/test-cache-api.js @@ -50,30 +50,29 @@ testPutAllGetAll = function() { function onStartGetAll(cacheName, error, ignite) { var cache = ignite.cache(cacheName); - var keys = ["key1", "key2"]; + var map = {"key1": "val1", "key2" : "val2"}; - var values = ["val1", "val2"]; - - cache.putAll(keys, values, onPutAll.bind(null, cache, keys, values)); + cache.putAll(map, onPutAll.bind(null, cache, map)); } -function onPutAll(cache, keys, values, error) { +function onPutAll(cache, map, error) { assert(error == null); - cache.getAll(keys, onGetAll.bind(null, cache, keys, values)); + cache.getAll(Object.keys(map), onGetAll.bind(null, cache, map)); } -function onGetAll(cache, keys, expected, error, values) { - console.log("error get all: " + error) +function onGetAll(cache, expected, error, values) { assert(error == null, error); + var keys = Object.keys(expected); + for (var i = 0; i < keys.length; ++i) { var key = keys[i]; assert(!!values[key], "Cannot find key. [key=" + key + "]."); - assert(values[key] === expected[i], "Incorrect value. [key=" + key + - ", expected=" + expected[i] + ", val= " + values[key] + "]."); + assert(values[key] === expected[key], "Incorrect value. [key=" + key + + ", expected=" + expected[key] + ", val= " + values[key] + "]."); } TestUtils.testDone();
