Repository: incubator-ignite Updated Branches: refs/heads/ignite-648 c8c1600a5 -> fbcb8275d
ignite-648: local jvm grid to proxy Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68bd6d6c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68bd6d6c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68bd6d6c Branch: refs/heads/ignite-648 Commit: 68bd6d6c946512ca4cf4cb3156d092128d547429 Parents: c8c1600 Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue Apr 14 19:15:26 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue Apr 14 19:15:26 2015 +0300 ---------------------------------------------------------------------- .../GridCachePartitionedMultiJvmFullApiSelfTest.java | 14 +++++++++++--- .../processors/cache/multijvm/IgniteExProxy.java | 14 +++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68bd6d6c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java index 54f1c20..3f3c6ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java @@ -29,6 +29,9 @@ import java.util.*; * TODO: Add class description. */ public class GridCachePartitionedMultiJvmFullApiSelfTest extends GridCachePartitionedMultiNodeFullApiSelfTest { + /** Local ignite. */ + private Ignite locIgnite; + /** Proces name to process map. */ private final Map<String, IgniteExProxy> ignites = new HashMap<>(); @@ -43,6 +46,8 @@ public class GridCachePartitionedMultiJvmFullApiSelfTest extends GridCachePartit ignite.getProcess().kill(); ignites.clear(); + + locIgnite = null; super.afterTestsStopped(); } @@ -73,15 +78,18 @@ public class GridCachePartitionedMultiJvmFullApiSelfTest extends GridCachePartit /** {@inheritDoc} */ protected Ignite startGrid(String gridName, GridSpringResourceContext ctx) throws Exception { - if (gridName.endsWith("0")) - return super.startGrid(gridName, ctx); + if (gridName.endsWith("0")) { + locIgnite = super.startGrid(gridName, ctx); + + return locIgnite; + } startingGrid.set(gridName); try { IgniteConfiguration cfg = optimize(getConfiguration(gridName)); - IgniteExProxy proxy = new IgniteExProxy(cfg, log); + IgniteExProxy proxy = new IgniteExProxy(cfg, locIgnite); ignites.put(gridName, proxy); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68bd6d6c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java index 7dab762..6f01052 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java @@ -45,12 +45,14 @@ public class IgniteExProxy implements IgniteEx { private final GridJavaProcess proc; private final IgniteConfiguration cfg; + private final Ignite locJvmGrid; private final IgniteLogger log; private final UUID id = UUID.randomUUID(); - public IgniteExProxy(final IgniteConfiguration cfg, final IgniteLogger log) throws Exception { + public IgniteExProxy(final IgniteConfiguration cfg, final Ignite locJvmGrid) throws Exception { this.cfg = cfg; - this.log = log; + this.locJvmGrid = locJvmGrid; + this.log = locJvmGrid.log(); String cfgAsString = IgniteNodeRunner.asParams(id, cfg); @@ -127,7 +129,7 @@ public class IgniteExProxy implements IgniteEx { } @Override public IgniteClusterEx cluster() { - return (IgniteClusterEx)Ignition.ignite().cluster(); + return (IgniteClusterEx)locJvmGrid.cluster(); } @Nullable @Override public String latestVersion() { @@ -235,11 +237,9 @@ public class IgniteExProxy implements IgniteEx { } @Override public <K, V> IgniteCache<K, V> cache(@Nullable final String name) { - Ignite ignite = Ignition.ignite(); - - ClusterGroup grp = ignite.cluster().forNodeId(id); + ClusterGroup grp = locJvmGrid.cluster().forNodeId(id); - return ignite.compute(grp).apply(new C1<Set<String>, IgniteCache<K,V>>() { + return locJvmGrid.compute(grp).apply(new C1<Set<String>, IgniteCache<K,V>>() { @Override public IgniteCache<K,V> apply(Set<String> objects) { X.println(">>>>> Cache");
