Repository: incubator-ignite Updated Branches: refs/heads/ignite-683 2dc16b2f3 -> fb7cfcf8b
#ignite-683: Remove methods from GridCacheProjectionEx. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb7cfcf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb7cfcf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb7cfcf8 Branch: refs/heads/ignite-683 Commit: fb7cfcf8badc7abb4c9e19887aa0f552683c48db Parents: 2dc16b2 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Apr 8 17:48:17 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Apr 8 17:48:17 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 96 ++++++++++++++--- .../processors/cache/GridCacheProjectionEx.java | 96 ----------------- .../cache/GridCacheProjectionImpl.java | 65 ++---------- .../processors/cache/GridCacheProxyImpl.java | 106 ------------------- 4 files changed, 86 insertions(+), 277 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb7cfcf8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 648f5c7..d87cde5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -2053,8 +2053,17 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return put(key, val, null, filter); } - /** {@inheritDoc} */ - @Nullable @Override public V put(final K key, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key. + * @param val Value. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + @Nullable public V put(final K key, final V val, @Nullable final GridCacheEntryEx cached, @Nullable final CacheEntryPredicate[] filter) @@ -2087,8 +2096,17 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return prevVal; } - /** {@inheritDoc} */ - @Override public boolean putx(final K key, final V val, @Nullable final GridCacheEntryEx cached, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key. + * @param val Value. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + public boolean putx(final K key, final V val, @Nullable final GridCacheEntryEx cached, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); @@ -2156,8 +2174,16 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return fut; } - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key. + * @param val Value. + * @param entry Optional cached entry. + * @param filter Optional filter. + * @return Put operation future. + */ + public IgniteInternalFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); @@ -2520,8 +2546,16 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return fut; } - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> putxAsync(final K key, final V val, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key. + * @param val Value. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Putx operation future. + */ + public IgniteInternalFuture<Boolean> putxAsync(final K key, final V val, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); @@ -2881,8 +2915,16 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return remove(key, null, null); } - /** {@inheritDoc} */ - @Override public V remove(final K key, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key to remove. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + public V remove(final K key, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -2928,8 +2970,15 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return fut; } - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(final K key, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key to remove. + * @param entry Optional cached entry. + * @param filter Optional filter. + * @return Put operation future. + */ + public IgniteInternalFuture<V> removeAsync(final K key, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -3029,8 +3078,16 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return rmv; } - /** {@inheritDoc} */ - @Override public boolean removex(final K key, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key to remove. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + public boolean removex(final K key, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -3091,8 +3148,15 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return removexAsync(key, null, filter); } - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(final K key, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key to remove. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Putx operation future. + */ + public IgniteInternalFuture<Boolean> removexAsync(final K key, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb7cfcf8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java index 3d0127c..e7c7689 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java @@ -43,56 +43,6 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { GridCacheProjectionEx<K, V> forSubjectId(UUID subjId); /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key. - * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - @Nullable public V put(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key. - * @param val Value. - * @param entry Optional cached entry. - * @param filter Optional filter. - * @return Put operation future. - */ - public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter); - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key. - * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key. - * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Putx operation future. - */ - public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter); - - /** * Store DR data. * * @param drMap DR map. @@ -111,29 +61,6 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { throws IgniteCheckedException; /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - @Nullable public V remove(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key to remove. - * @param entry Optional cached entry. - * @param filter Optional filter. - * @return Put operation future. - */ - public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter); - - /** * Removes DR data. * * @param drMap DR map. @@ -151,29 +78,6 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { public IgniteInternalFuture<?> removeAllConflictAsync(Map<KeyCacheObject, GridCacheVersion> drMap) throws IgniteCheckedException; /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - public boolean removex(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Putx operation future. - */ - public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter); - - /** * Asynchronously stores given key-value pair in cache only if only if the previous value is equal to the * {@code 'oldVal'} passed in. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb7cfcf8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 1fbaa92..6394c45 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -350,32 +349,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public V put(K key, V val) throws IgniteCheckedException { - return putAsync(key, val, null, CU.empty0()).get(); - } - - /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return cache.put(key, val, entry, filter); + return cache.put(key, val); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val) { - return putAsync(key, val, null, null); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate[] filter) { - A.notNull(key, "key", val, "val"); - - return cache.putAsync(key, val, entry, filter); - } - - /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return cache.putx(key, val, entry, filter); + return cache.putAsync(key, val); } /** {@inheritDoc} */ @@ -437,15 +416,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val) { - return putxAsync(key, val, null, null); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate[] filter) { - A.notNull(key, "key", val, "val"); - - return cache.putxAsync(key, val, entry, filter); + return cache.putxAsync(key, val); } /** {@inheritDoc} */ @@ -573,7 +544,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Nullable @Override public V localPeek(K key, - CachePeekMode[] peekModes, + CachePeekMode[] peekModes, @Nullable IgniteCacheExpiryPolicy plc) throws IgniteCheckedException { @@ -661,20 +632,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V remove(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return removeAsync(key, entry, filter).get(); - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> removeAsync(K key) { - return removeAsync(key, null, CU.empty0()); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - return cache.removeAsync(key, entry, filter); + return cache.removeAsync(key); } /** {@inheritDoc} */ @@ -694,20 +653,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public boolean removex(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return removexAsync(key, entry, filter).get(); - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removexAsync(K key) { - return removexAsync(key, null, CU.empty0()); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - return cache.removexAsync(key, entry, filter); + return cache.removexAsync(key); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb7cfcf8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index 739291f..051c52e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -591,19 +591,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.put(key, val, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -616,32 +603,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.putAsync(key, val, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.putx(key, val, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public boolean putx(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -777,21 +738,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, - V val, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.putxAsync(key, val, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Nullable @Override public V putIfAbsent(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1315,19 +1261,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public V remove(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.remove(key, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> removeAsync(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1340,19 +1273,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.removeAsync(key, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public boolean removex(K key) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1393,19 +1313,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean removex(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.removex(key, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removexAsync(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1418,19 +1325,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.removexAsync(key, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal, V newVal) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
