ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/50] [abbrv] incubator-ignite git commit: #ignite-683: Remove one of method put from GridCacheAdapter.
Date Tue, 14 Apr 2015 14:25:28 GMT
#ignite-683: Remove one of method put from GridCacheAdapter.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a19cd91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a19cd91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a19cd91

Branch: refs/heads/ignite-218
Commit: 2a19cd9193ef3d22d8d9855aaecf65373468266b
Parents: 7703ed1
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Apr 13 12:10:47 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Apr 13 12:10:47 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java         | 17 ++---------------
 .../distributed/dht/atomic/GridDhtAtomicCache.java |  2 +-
 .../distributed/near/GridNearAtomicCache.java      |  4 ++--
 .../cache/local/atomic/GridLocalAtomicCache.java   |  2 +-
 4 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a19cd91/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 0e45746..426994b 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
@@ -1949,22 +1949,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
         }
     }
 
-    /**
-     * @param key Key to store in cache.
-     * @param val Value to be associated with the given key.
-     * @param filter Filter.
-     * @return Previous value associated with specified key, or {@code null}
-     *  if entry did not pass the filter, or if there was no mapping for the key in swap
-     *  or in persistent storage.
-     * @throws IgniteCheckedException If failed.
-     */
-    public V put(K key, V val, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
-        return put0(key, val, filter);
-    }
-
     /** {@inheritDoc} */
     @Override public V put(K key, V val) throws IgniteCheckedException {
-        return put0(key, val, CU.empty0());
+        return put(key, val, CU.empty0());
     }
 
     /**
@@ -1974,7 +1961,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      * @return Previous value.
      * @throws IgniteCheckedException If failed.
      */
-    @Nullable public V put0(final K key, final V val, @Nullable final CacheEntryPredicate[]
filter)
+    @Nullable public V put(final K key, final V val, @Nullable final CacheEntryPredicate[]
filter)
         throws IgniteCheckedException
     {
         boolean statsEnabled = ctx.config().isStatisticsEnabled();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a19cd91/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index d2ca976..dfac7f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -291,7 +291,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public V put0(K key, V val, @Nullable CacheEntryPredicate[] filter) throws
IgniteCheckedException {
+    @Override public V put(K key, V val, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException
{
         return putAsync0(key, val, filter).get();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a19cd91/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index a1583dd..f6211c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -388,8 +388,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public V put0( K key, V val, @Nullable CacheEntryPredicate[] filter) throws
IgniteCheckedException {
-        return dht.put0(key, val, filter);
+    @Override public V put(K key, V val, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException
{
+        return dht.put(key, val, filter);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a19cd91/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 7c4a488..12bce3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -100,7 +100,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public V put0(K key, V val, @Nullable CacheEntryPredicate[] filter) throws
IgniteCheckedException {
+    @Override public V put(K key, V val, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException
{
         A.notNull(key, "key", val, "val");
 
         return (V)updateAllInternal(UPDATE,


Mime
View raw message