#IGNITE-106: Remove grid from comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3dedd1ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3dedd1ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3dedd1ab Branch: refs/heads/ignite-6 Commit: 3dedd1ab05207d260ce718b501d70dbf816baa9a Parents: 921fd0c Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Feb 2 17:30:02 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Feb 2 17:30:02 2015 +0300 ---------------------------------------------------------------------- examples/config/example-streamer.xml | 2 +- examples/config/filesystem/example-ggfs.xml | 2 +- .../examples/misc/lifecycle/LifecycleExample.java | 4 ++-- .../examples/misc/springbean/SpringBeanExample.java | 4 ++-- .../apache/ignite/examples/misc/springbean/package.html | 2 +- .../ignite/examples/services/ServicesExample.java | 2 +- .../examples/streaming/StreamingCheckInExample.java | 2 +- .../streaming/StreamingPopularNumbersExample.java | 2 +- .../scalar/examples/ScalarCreditRiskExample.scala | 12 ++++++------ .../ignite/scalar/examples/ScalarJvmCloudExample.scala | 2 +- .../ignite/scalar/examples/ScalarPrimeExample.scala | 6 +++--- .../ignite/scalar/examples/ScalarTaskExample.scala | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/config/example-streamer.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml index c22b19b..1789fad 100644 --- a/examples/config/example-streamer.xml +++ b/examples/config/example-streamer.xml @@ -39,7 +39,7 @@ Optional description. --> <description> - Spring file for grid configuration with benchmark. + Spring file for ignite configuration with benchmark. </description> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/config/filesystem/example-ggfs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml index 02a8305..5ff8f8c 100644 --- a/examples/config/filesystem/example-ggfs.xml +++ b/examples/config/filesystem/example-ggfs.xml @@ -38,7 +38,7 @@ Optional description. --> <description> - Spring file for grid configuration with client available endpoints. + Spring file for ignite configuration with client available endpoints. </description> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java index c5e45da..180e5ef 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java @@ -51,11 +51,11 @@ public final class LifecycleExample { cfg.setLifecycleBeans(bean); try (Ignite ignite = Ignition.start(cfg)) { - // Make sure that lifecycle bean was notified about grid startup. + // Make sure that lifecycle bean was notified about ignite startup. assert bean.isStarted(); } - // Make sure that lifecycle bean was notified about grid stop. + // Make sure that lifecycle bean was notified about ignite stop. assert !bean.isStarted(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java index f233036..74b3897 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java @@ -57,10 +57,10 @@ public final class SpringBeanExample { new ClassPathXmlApplicationContext("org/apache/ignite/examples/misc/springbean/spring-bean.xml"); try { - // Get grid from Spring (note that local cluster node is already started). + // Get ignite from Spring (note that local cluster node is already started). Ignite ignite = (Ignite)ctx.getBean("mySpringBean"); - // Execute any method on the retrieved grid instance. + // Execute any method on the retrieved ignite instance. ExecutorService exec = ignite.executorService(); Future<String> res = exec.submit(new Callable<String>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package.html ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package.html b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package.html index 99b1a16..97d48b5 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package.html +++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package.html @@ -19,6 +19,6 @@ <html> <body> <!-- Package description. --> - HelloWorld example that accesses grid started directly from Spring bean. + HelloWorld example that accesses ignite started directly from Spring bean. </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java b/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java index 4771f44..b7ce28d 100644 --- a/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java @@ -27,7 +27,7 @@ import java.util.*; /** * Example that demonstrates how to deploy distributed services in Ignite. - * Distributed services are especially useful when deploying singletons on the grid, + * Distributed services are especially useful when deploying singletons on the ignite, * be that cluster-singleton, or per-node-singleton, etc... * <p> * To start remote nodes, you must run {@link ComputeNodeStartup} in another JVM http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java index 347b54d..7b5f5d9 100644 --- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java @@ -106,7 +106,7 @@ public class StreamingCheckInExample { public static void main(String[] args) throws Exception { Timer timer = new Timer("check-in-query-worker"); - // Start grid. + // Start ignite. final Ignite ignite = Ignition.start("examples/config/example-streamer.xml"); System.out.println(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java index d249c33..e17a696 100644 --- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java @@ -96,7 +96,7 @@ public class StreamingPopularNumbersExample { public static void main(String[] args) throws Exception { Timer popularNumbersQryTimer = new Timer("numbers-query-worker"); - // Start grid. + // Start ignite. final Ignite ignite = Ignition.start("examples/config/example-streamer.xml"); System.out.println(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala index 18b1fb3..45d3e60 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala @@ -76,22 +76,22 @@ object ScalarCreditRiskExample { /** * Creates closures for calculating credit risks. * - * @param gridSize Size of the grid. + * @param clusterSize Size of the grid. * @param portfolio Portfolio. * @param horizon Forecast horizon in days. * @param iter Number of Monte-Carlo iterations. * @param percentile Percentile. * @return Collection of closures. */ - private def closures(gridSize: Int, portfolio: Seq[Credit], horizon: Int, iter: Int, + private def closures(clusterSize: Int, portfolio: Seq[Credit], horizon: Int, iter: Int, percentile: Double): Seq[() => Double] = { - val iterPerNode: Int = math.round(iter / gridSize.asInstanceOf[Float]) - val lastNodeIter: Int = iter - (gridSize - 1) * iterPerNode + val iterPerNode: Int = math.round(iter / clusterSize.asInstanceOf[Float]) + val lastNodeIter: Int = iter - (clusterSize - 1) * iterPerNode var cls = Seq.empty[() => Double] - (0 until gridSize).foreach(i => { - val nodeIter = if (i == gridSize - 1) lastNodeIter else iterPerNode + (0 until clusterSize).foreach(i => { + val nodeIter = if (i == clusterSize - 1) lastNodeIter else iterPerNode cls +:= (() => new CreditRiskManager().calculateCreditRiskMonteCarlo( portfolio, horizon, nodeIter, percentile)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala index e2ddd67..f13d1be 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala @@ -81,7 +81,7 @@ object ScalarJvmCloudExample { null, Array[JComponent]( new JLabel("Ignite JVM cloud started."), - new JLabel("Number of nodes in the grid: " + scalar.grid$(NODES(1)).get.cluster().nodes().size()), + new JLabel("Number of nodes in the cluster: " + scalar.grid$(NODES(1)).get.cluster().nodes().size()), new JLabel("Click OK to stop.") ), "Ignite", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala index 25af7d7..3db6488 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala @@ -85,15 +85,15 @@ object ScalarPrimeExample { * Closures checks if the value passed in is divisible by any of * the divisors in the range. * - * @param gridSize Size of the grid. + * @param clusterSize Size of the cluster. * @param checkVal Value to check. * @return Collection of closures. */ - private def closures(gridSize: Int, checkVal: Long): Seq[() => Option[Long]] = { + private def closures(clusterSize: Int, checkVal: Long): Seq[() => Option[Long]] = { var cls = Seq.empty[() => Option[Long]] val taskMinRange = 2L - val numbersPerTask = if (checkVal / gridSize < 10) 10L else checkVal / gridSize + val numbersPerTask = if (checkVal / clusterSize < 10) 10L else checkVal / clusterSize var minRange = 0L var maxRange = 0L http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dedd1ab/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala index eac3efd..c5a5f4c 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala @@ -43,7 +43,7 @@ object ScalarTaskExample extends App { * This task encapsulates the logic of MapReduce. */ class GridHelloWorld extends ComputeTaskSplitAdapter[String, Void] { - def split(gridSize: Int, arg: String): java.util.Collection[_ <: ComputeJob] = { + def split(clusterSize: Int, arg: String): java.util.Collection[_ <: ComputeJob] = { (for (w <- arg.split(" ")) yield toJob(() => println(w))).toSeq }
