# ignite-648: refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02bcadd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02bcadd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02bcadd5 Branch: refs/heads/ignite-648 Commit: 02bcadd5523672d8f49b36bde3dec01d88aaddcd Parents: cdaac3e Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue Apr 21 16:44:50 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue Apr 21 16:44:50 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/multijvm/CacheProxy.java | 104 +++++++------------ .../cache/multijvm/IgniteExProxy.java | 19 ++-- 2 files changed, 45 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02bcadd5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/CacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/CacheProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/CacheProxy.java index ed02526..6ff1c83 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/CacheProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/CacheProxy.java @@ -14,7 +14,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.lang.*; import org.apache.ignite.mxbean.*; import org.jetbrains.annotations.*; @@ -35,14 +34,30 @@ import java.util.concurrent.locks.*; * @version @java.version */ public class CacheProxy<K, V> implements IgniteCache<K, V> { - private transient IgniteExProxy proxy; + /** Proxy. */ + private final transient IgniteExProxy proxy; + + /** Compute. */ + private final transient IgniteCompute compute; + + /** Cache name. */ private final String cacheName; + + /** Grid id. */ private final UUID gridId; + /** + * @param name Name. + * @param proxy Ignite Process Proxy. + */ public CacheProxy(String name, IgniteExProxy proxy) { this.proxy = proxy; cacheName = name; gridId = proxy.getId(); + + ClusterGroup grp = proxy.localJvmGrid().cluster().forNodeId(proxy.getId()); + + compute = proxy.localJvmGrid().compute(grp); } /** {@inheritDoc} */ @@ -81,14 +96,12 @@ public class CacheProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ - @Override - public void loadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) throws CacheException { + @Override public void loadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) throws CacheException { // TODO: CODE: implement. } /** {@inheritDoc} */ - @Override - public void localLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) throws CacheException { + @Override public void localLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) throws CacheException { // TODO: CODE: implement. } @@ -153,34 +166,19 @@ public class CacheProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ - @Override - public <T> Map<K, EntryProcessorResult<T>> invokeAll(Map<? extends K, ? extends EntryProcessor<K, V, T>> map, + @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll(Map<? extends K, ? extends EntryProcessor<K, V, T>> map, Object... args) { return null; // TODO: CODE: implement. } /** {@inheritDoc} */ @Override public V get(K key) { - ClusterGroup grp = proxy.localJvmGrid().cluster().forNodeId(proxy.getId()); - - IgniteCompute compute = proxy.localJvmGrid().compute(grp); - - return compute.broadcast(new MyClos2<K, V>(gridId, cacheName), key).iterator().next(); + return compute.broadcast(new IgniteClosureX<K, V>() { + @Override public V applyx(K k) { + return (V)Ignition.ignite(gridId).cache(cacheName).get(k); + } + }, key).iterator().next(); } - - public static class MyClos2<K, V> extends IgniteClosureX<K, V> { - private final UUID id; - private final String name; - - public MyClos2(UUID id, String name) { - this.id = id; - this.name = name; - } - - @Override public V applyx(K k) { - return (V)Ignition.ignite(id).cache(name).get(k); - } - } /** {@inheritDoc} */ @Override public Map<K, V> getAll(Set<? extends K> keys) { @@ -193,8 +191,7 @@ public class CacheProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ - @Override - public void loadAll(Set<? extends K> keys, boolean replaceExistingValues, CompletionListener completionListener) { + @Override public void loadAll(Set<? extends K> keys, boolean replaceExistingValues, CompletionListener completionListener) { // TODO: CODE: implement. } @@ -255,39 +252,13 @@ public class CacheProxy<K, V> implements IgniteCache<K, V> { /** {@inheritDoc} */ @Override public void removeAll(final Set<? extends K> keys) { - ClusterGroup grp = proxy.localJvmGrid().cluster().forNodeId(proxy.getId()); - - IgniteCompute compute = proxy.localJvmGrid().compute(grp); - - compute.broadcast(new MyClos(proxy.getId(), proxy.name(), cacheName), keys); - } - - public static class MyClos extends IgniteClosureX<Set<?>, String> { - private UUID id; - private final String gridName; - private final String cacheName; - - public MyClos(UUID id, String gridName, String cacheName) { - this.id = id; - this.gridName = gridName; - this.cacheName = cacheName; - } - - @Override public String applyx(Set<?> ks) throws IgniteCheckedException { - X.println(">>>>> Cache. Removing keys=" + ks); - - Ignite ignite = Ignition.ignite(id); - - X.println(">>>>> Cache. Ignite=" + ignite); - - IgniteCache<Object, Object> cache = ignite.cache(cacheName); - - X.println(">>>>> Cache. Cache=" + cache); - - cache.removeAll(ks); - - return ""; - } + compute.broadcast(new IgniteClosureX<Set<?>, Void>() { + @Override public Void applyx(Set<?> ks) { + Ignition.ignite(gridId).cache(cacheName).removeAll(ks); + + return null; + } + }, keys); } /** {@inheritDoc} */ @@ -331,8 +302,7 @@ public class CacheProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ - @Override - public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys, EntryProcessor<K, V, T> entryProcessor, + @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys, EntryProcessor<K, V, T> entryProcessor, Object... args) { return null; // TODO: CODE: implement. } @@ -363,14 +333,12 @@ public class CacheProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ - @Override - public void registerCacheEntryListener(CacheEntryListenerConfiguration<K, V> cacheEntryListenerConfiguration) { + @Override public void registerCacheEntryListener(CacheEntryListenerConfiguration<K, V> cacheEntryListenerConfiguration) { // TODO: CODE: implement. } /** {@inheritDoc} */ - @Override - public void deregisterCacheEntryListener(CacheEntryListenerConfiguration<K, V> cacheEntryListenerConfiguration) { + @Override public void deregisterCacheEntryListener(CacheEntryListenerConfiguration<K, V> cacheEntryListenerConfiguration) { // TODO: CODE: implement. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02bcadd5/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 cf7079d..a73db84 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 @@ -35,10 +35,7 @@ import java.util.*; import java.util.concurrent.*; /** - * TODO: Add class description. - * - * @author @java.author - * @version @java.version + * Ignite proxy for ignite instance at another JVM. */ public class IgniteExProxy implements IgniteEx { private static final Map<String, IgniteExProxy> gridProxies = new HashMap<>(); @@ -49,6 +46,11 @@ public class IgniteExProxy implements IgniteEx { private final IgniteLogger log; private final UUID id = UUID.randomUUID(); + /** + * @param cfg Configuration. + * @param log Logger. + * @param locJvmGrid Local jvm grid. + */ public IgniteExProxy(final IgniteConfiguration cfg, final IgniteLogger log, final Ignite locJvmGrid) throws Exception { this.cfg = cfg; this.locJvmGrid = locJvmGrid; @@ -283,8 +285,7 @@ public class IgniteExProxy implements IgniteEx { } /** {@inheritDoc} */ - @Override - public <K, V> IgniteCache<K, V> createNearCache(@Nullable String cacheName, NearCacheConfiguration<K, V> nearCfg) { + @Override public <K, V> IgniteCache<K, V> createNearCache(@Nullable String cacheName, NearCacheConfiguration<K, V> nearCfg) { return null; // TODO: CODE: implement. } @@ -325,8 +326,7 @@ public class IgniteExProxy implements IgniteEx { } /** {@inheritDoc} */ - @Override - public IgniteAtomicSequence atomicSequence(String name, long initVal, boolean create) throws IgniteException { + @Override public IgniteAtomicSequence atomicSequence(String name, long initVal, boolean create) throws IgniteException { return null; // TODO: CODE: implement. } @@ -342,8 +342,7 @@ public class IgniteExProxy implements IgniteEx { } /** {@inheritDoc} */ - @Override - public <T, S> IgniteAtomicStamped<T, S> atomicStamped(String name, @Nullable T initVal, @Nullable S initStamp, + @Override public <T, S> IgniteAtomicStamped<T, S> atomicStamped(String name, @Nullable T initVal, @Nullable S initStamp, boolean create) throws IgniteException { return null; // TODO: CODE: implement. }
