Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC81217A13 for ; Mon, 2 Feb 2015 15:59:12 +0000 (UTC) Received: (qmail 19552 invoked by uid 500); 2 Feb 2015 15:59:10 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 19518 invoked by uid 500); 2 Feb 2015 15:59:10 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 19509 invoked by uid 99); 2 Feb 2015 15:59:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 15:59:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Feb 2015 15:58:17 +0000 Received: (qmail 13650 invoked by uid 99); 2 Feb 2015 15:58:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 15:58:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3F93E05D9; Mon, 2 Feb 2015 15:58:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Feb 2015 15:58:40 -0000 Message-Id: <938ae4bd9c394c098fbf2e56ad5eb99c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/42] incubator-ignite git commit: # IGNITE-102: Renaming + debug. X-Virus-Checked: Checked by ClamAV on apache.org # IGNITE-102: Renaming + debug. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa4ac59a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa4ac59a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa4ac59a Branch: refs/heads/ignite-56 Commit: fa4ac59ac62e5fe2a14405e1cac51bfe94f5cb58 Parents: 641a4c8 Author: AKuznetsov Authored: Thu Jan 29 10:13:29 2015 +0700 Committer: AKuznetsov Committed: Thu Jan 29 10:13:29 2015 +0700 ---------------------------------------------------------------------- .../ignite/yardstick/IgniteAbstractBenchmark.java | 6 +++--- .../ignite/yardstick/cache/IgniteGetBenchmark.java | 2 +- .../ignite/yardstick/cache/IgnitePutBenchmark.java | 2 +- .../ignite/yardstick/cache/IgnitePutGetBenchmark.java | 2 +- .../ignite/yardstick/cache/IgnitePutGetTxBenchmark.java | 12 ++++++++++-- .../ignite/yardstick/cache/IgnitePutTxBenchmark.java | 2 +- .../ignite/yardstick/cache/IgniteSqlQueryBenchmark.java | 4 ++-- .../yardstick/cache/IgniteSqlQueryJoinBenchmark.java | 4 ++-- .../yardstick/cache/IgniteSqlQueryPutBenchmark.java | 2 +- .../yardstick/compute/IgniteAffinityCallBenchmark.java | 2 +- .../ignite/yardstick/compute/IgniteApplyBenchmark.java | 2 +- .../yardstick/compute/IgniteBroadcastBenchmark.java | 2 +- .../yardstick/compute/IgniteExecuteBenchmark.java | 2 +- .../ignite/yardstick/compute/IgniteRunBenchmark.java | 2 +- 14 files changed, 27 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java index 6f9f903..c09d185 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java @@ -78,7 +78,7 @@ public abstract class IgniteAbstractBenchmark extends BenchmarkDriverAdapter { /** * @return Grid. */ - protected Ignite grid() { + protected Ignite ignite() { return node.ignite(); } @@ -88,7 +88,7 @@ public abstract class IgniteAbstractBenchmark extends BenchmarkDriverAdapter { private void waitForNodes() throws Exception { final CountDownLatch nodesStartedLatch = new CountDownLatch(1); - grid().events().localListen(new IgnitePredicate() { + ignite().events().localListen(new IgnitePredicate() { @Override public boolean apply(IgniteEvent gridEvt) { if (nodesStarted()) nodesStartedLatch.countDown(); @@ -108,7 +108,7 @@ public abstract class IgniteAbstractBenchmark extends BenchmarkDriverAdapter { * @return {@code True} if all nodes are started, {@code false} otherwise. */ private boolean nodesStarted() { - return grid().cluster().nodes().size() >= args.nodes(); + return ignite().cluster().nodes().size() >= args.nodes(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java index 783523b..4e4ee9d 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java @@ -36,6 +36,6 @@ public class IgniteGetBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache cache() { - return grid().jcache("atomic"); + return ignite().jcache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java index ee55d57..1993ac8 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java @@ -37,6 +37,6 @@ public class IgnitePutBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache cache() { - return grid().jcache("atomic"); + return ignite().jcache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java index 73b183f..cb6e220 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java @@ -42,6 +42,6 @@ public class IgnitePutGetBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache cache() { - return grid().jcache("atomic"); + return ignite().jcache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java index a274b5b..944d6a4 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java @@ -31,15 +31,23 @@ public class IgnitePutGetTxBenchmark extends IgniteCacheAbstractBenchmark { @Override public boolean test(Map ctx) throws Exception { int key = nextRandom(0, args.range() / 2); - try (IgniteTx tx = grid().transactions().txStart()) { + ignite().log().debug("IgnitePutGetTxBenchmark - key: " + key); + + try (IgniteTx tx = ignite().transactions().txStart()) { + ignite().log().debug("IgnitePutGetTxBenchmark: txStart()"); + Object val = cache.get(key); + ignite().log().debug("IgnitePutGetTxBenchmark - get():" + val); + if (val != null) key = nextRandom(args.range() / 2, args.range()); cache.put(key, new SampleValue(key)); tx.commit(); + + ignite().log().debug("IgnitePutGetTxBenchmark - txCommit"); } return true; @@ -47,6 +55,6 @@ public class IgnitePutGetTxBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache cache() { - return grid().jcache("tx"); + return ignite().jcache("tx"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java index 1f92392..ebf4f20 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java @@ -38,6 +38,6 @@ public class IgnitePutTxBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache cache() { - return grid().jcache("tx"); + return ignite().jcache("tx"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java index 3bca3d6..967197f 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java @@ -42,7 +42,7 @@ public class IgniteSqlQueryBenchmark extends IgniteCacheAbstractBenchmark { long start = System.nanoTime(); - try (IgniteDataLoader dataLdr = grid().dataLoader(cache.getName())) { + try (IgniteDataLoader dataLdr = ignite().dataLoader(cache.getName())) { for (int i = 0; i < args.range() && !Thread.currentThread().isInterrupted(); i++) { dataLdr.addData(i, new Person(i, "firstName" + i, "lastName" + i, i * 1000)); @@ -89,6 +89,6 @@ public class IgniteSqlQueryBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache cache() { - return grid().jcache("query"); + return ignite().jcache("query"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java index 5f8cc77..d74c56d 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java @@ -42,7 +42,7 @@ public class IgniteSqlQueryJoinBenchmark extends IgniteCacheAbstractBenchmark { long start = System.nanoTime(); - try (IgniteDataLoader dataLdr = grid().dataLoader(cache.getName())) { + try (IgniteDataLoader dataLdr = ignite().dataLoader(cache.getName())) { final int orgRange = args.range() / 10; // Populate organizations. @@ -113,6 +113,6 @@ public class IgniteSqlQueryJoinBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache cache() { - return grid().jcache("query"); + return ignite().jcache("query"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java index fcb8f2e..d4a7221 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java @@ -81,6 +81,6 @@ public class IgniteSqlQueryPutBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache cache() { - return grid().jcache("query"); + return ignite().jcache("query"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteAffinityCallBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteAffinityCallBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteAffinityCallBenchmark.java index 7008d52..eeff847 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteAffinityCallBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteAffinityCallBenchmark.java @@ -29,7 +29,7 @@ import java.util.concurrent.*; public class IgniteAffinityCallBenchmark extends IgniteAbstractBenchmark { /** {@inheritDoc} */ @Override public boolean test(Map ctx) throws Exception { - grid().compute().affinityCall("compute", ThreadLocalRandom.current().nextInt(), new NoopCallable()); + ignite().compute().affinityCall("compute", ThreadLocalRandom.current().nextInt(), new NoopCallable()); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteApplyBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteApplyBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteApplyBenchmark.java index 816d0d0..d42b356 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteApplyBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteApplyBenchmark.java @@ -45,7 +45,7 @@ public class IgniteApplyBenchmark extends IgniteAbstractBenchmark { /** {@inheritDoc} */ @Override public boolean test(Map ctx) throws Exception { - grid().compute().apply(new NoopClosure(), applyArgs); + ignite().compute().apply(new NoopClosure(), applyArgs); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteBroadcastBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteBroadcastBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteBroadcastBenchmark.java index 1be6c44..0104a7b 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteBroadcastBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteBroadcastBenchmark.java @@ -28,7 +28,7 @@ import java.util.*; public class IgniteBroadcastBenchmark extends IgniteAbstractBenchmark { /** {@inheritDoc} */ @Override public boolean test(Map ctx) throws Exception { - grid().compute().broadcast(new NoopCallable()); + ignite().compute().broadcast(new NoopCallable()); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteExecuteBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteExecuteBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteExecuteBenchmark.java index 125ea6a..c2dc4d4 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteExecuteBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteExecuteBenchmark.java @@ -28,7 +28,7 @@ import java.util.*; public class IgniteExecuteBenchmark extends IgniteAbstractBenchmark { /** {@inheritDoc} */ @Override public boolean test(Map ctx) throws Exception { - grid().compute().execute(new NoopTask(args.jobs()), null); + ignite().compute().execute(new NoopTask(args.jobs()), null); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa4ac59a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java index b9b43b3..0da0670 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java @@ -44,7 +44,7 @@ public class IgniteRunBenchmark extends IgniteAbstractBenchmark { /** {@inheritDoc} */ @Override public boolean test(Map ctx) throws Exception { - grid().compute().run(jobs); + ignite().compute().run(jobs); return true; }