Repository: incubator-ignite Updated Branches: refs/heads/ignite-961 42ab9f425 -> b5c48e8d0
#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/b5c48e8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b5c48e8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b5c48e8d Branch: refs/heads/ignite-961 Commit: b5c48e8d0a9aa4ce3329b8b97bc70a13cc39ce3d Parents: 42ab9f4 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 13 09:44:17 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 13 09:44:17 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/examples/js/ExampleJsNodeStartup.java | 2 +- examples/src/main/js/cache-api-example.js | 2 +- examples/src/main/js/cache-put-get-example.js | 2 +- examples/src/main/js/cache-query-example.js | 12 +++++++----- examples/src/main/js/cache-sql-fields-query-example.js | 10 ++++++---- examples/src/main/js/compute-run-example.js | 2 +- examples/src/main/js/map-reduce-example.js | 2 +- 7 files changed, 18 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5c48e8d/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java index 0de6047..1cf33f7 100644 --- a/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/js/ExampleJsNodeStartup.java @@ -31,6 +31,6 @@ public class ExampleJsNodeStartup { * @throws IgniteException If failed. */ public static void main(String[] args) throws IgniteException { - Ignition.start("examples/config/js/example-js-cache.xml"); + Ignition.start("examples/config/example-ignite.xml"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5c48e8d/examples/src/main/js/cache-api-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/cache-api-example.js b/examples/src/main/js/cache-api-example.js index dad0f34..f708160 100644 --- a/examples/src/main/js/cache-api-example.js +++ b/examples/src/main/js/cache-api-example.js @@ -35,7 +35,7 @@ function main() { function onConnect(err, ignite) { if (err !== null) - throw "Start remote node with config examples/config/js/example-js-cache.xml." + err; + throw "Start remote node with config examples/config/example-ignite.xml."; console.log(">>> Cache API example started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5c48e8d/examples/src/main/js/cache-put-get-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/cache-put-get-example.js b/examples/src/main/js/cache-put-get-example.js index ce6b47a..e12a54d 100644 --- a/examples/src/main/js/cache-put-get-example.js +++ b/examples/src/main/js/cache-put-get-example.js @@ -36,7 +36,7 @@ function main() { function onConnect(err, ignite) { if (err !== null) - throw "Start remote node with config examples/config/js/example-js-cache.xml."; + throw "Start remote node with config examples/config/example-ignite.xml."; ignite.getOrCreateCache(cacheName, function(err, cache) { putGetExample(ignite, cache); }); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5c48e8d/examples/src/main/js/cache-query-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/cache-query-example.js b/examples/src/main/js/cache-query-example.js index ba5e270..1c6b980 100644 --- a/examples/src/main/js/cache-query-example.js +++ b/examples/src/main/js/cache-query-example.js @@ -31,7 +31,7 @@ var CacheEntry = apacheIgnite.CacheEntry; * Alternatively you can run ExampleJsNodeStartup which will * start node with {@code examples/config/example-ignite.xml} configuration. */ -main() { +main = function() { /** Cache name. */ var cacheName = "CacheQueryExample"; @@ -40,7 +40,7 @@ main() { function onConnect(err, ignite) { if (err !== null) - throw "Start remote node with config examples/config/js/example-js-cache.xml."; + throw "Start remote node with config examples/config/example-ignite.xml."; console.log(">>> Cache query example started."); @@ -54,7 +54,7 @@ main() { function cacheQuery(ignite, cache, entries) { cache.putAll(entries, onCachePut); - function onCachePut(ignite, err) { + function onCachePut(err) { console.log(">>> Create cache for people.") //SQL clause which selects salaries based on range. @@ -106,6 +106,8 @@ main() { var value5 = {"firstName" : "Ann", "lastName" : "Smith", "salary" : 3000}; return [new CacheEntry(key1, value1), new CacheEntry(key2, value2), - new CacheEntry(key3, value3), new CacheEntry(key4, entry4)]; + new CacheEntry(key3, value3), new CacheEntry(key4, value4)]; } -} \ No newline at end of file +} + +main(); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5c48e8d/examples/src/main/js/cache-sql-fields-query-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/cache-sql-fields-query-example.js b/examples/src/main/js/cache-sql-fields-query-example.js index e8deb43..58eb26b 100644 --- a/examples/src/main/js/cache-sql-fields-query-example.js +++ b/examples/src/main/js/cache-sql-fields-query-example.js @@ -30,7 +30,7 @@ var CacheEntry = apacheIgnite.CacheEntry; * Alternatively you can run ExampleJsNodeStartup which will * start node with {@code examples/config/example-ignite.xml} configuration. */ -main() { +main = function() { /** Cache name. */ var cacheName = "CacheSqlFieldsQueryExample"; @@ -39,7 +39,7 @@ main() { function onConnect(err, ignite) { if (err !== null) - throw "Start remote node with config examples/config/js/example-js-cache.xml."; + throw "Start remote node with config examples/config/example-ignite.xml."; console.log(">>> Cache sql fields query example started."); @@ -100,6 +100,8 @@ main() { var value5 = {"firstName" : "Ann", "lastName" : "Smith", "salary" : 3000}; return [new CacheEntry(key1, value1), new CacheEntry(key2, value2), - new CacheEntry(key3, value3), new CacheEntry(key4, entry4)]; + new CacheEntry(key3, value3), new CacheEntry(key4, value4)]; } -} \ No newline at end of file +} + +main(); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5c48e8d/examples/src/main/js/compute-run-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/compute-run-example.js b/examples/src/main/js/compute-run-example.js index 61b9bbd..189c63f 100644 --- a/examples/src/main/js/compute-run-example.js +++ b/examples/src/main/js/compute-run-example.js @@ -35,7 +35,7 @@ function main() { function onConnect(err, ignite) { if (err !== null) - throw "Start remote node with config examples/config/js/example-js-cache.xml."; + throw "Start remote node with config examples/config/example-ignite.xml."; console.log(">>> Run cache script example started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5c48e8d/examples/src/main/js/map-reduce-example.js ---------------------------------------------------------------------- diff --git a/examples/src/main/js/map-reduce-example.js b/examples/src/main/js/map-reduce-example.js index a3e8305..7d762ab 100644 --- a/examples/src/main/js/map-reduce-example.js +++ b/examples/src/main/js/map-reduce-example.js @@ -36,7 +36,7 @@ function main() { function onConnect(err, ignite) { if (err !== null) - throw "Start remote node with config examples/config/js/example-js-cache.xml."; + throw "Start remote node with config examples/config/example-ignite.xml."; console.log(">>> Compute map reduce example started.");
