ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/8] incubator-ignite git commit: #ignite-683: Remove one of the method putx0 from GridCacheAdapter.
Date Mon, 13 Apr 2015 09:49:32 GMT
#ignite-683: Remove one of the method putx0 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/acd9c178
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/acd9c178
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/acd9c178

Branch: refs/heads/ignite-683-2
Commit: acd9c1784f8d97968684a734d97c33162cc67069
Parents: bc9ae95
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Apr 13 12:28:26 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Apr 13 12:28:26 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 26 --------------------
 .../dht/atomic/GridDhtAtomicCache.java          |  5 ----
 .../distributed/near/GridNearAtomicCache.java   |  5 ----
 .../local/atomic/GridLocalAtomicCache.java      | 16 ------------
 4 files changed, 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/acd9c178/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 28e4576..64cfb0c 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
@@ -2041,32 +2041,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
         });
     }
 
-    /**
-     * @param key Key.
-     * @param val Value.
-     * @param filter Optional filter.
-     * @return Previous value.
-     * @throws IgniteCheckedException If failed.
-     */
-    public boolean putx0(final K key, final V val, @Nullable final CacheEntryPredicate...
filter) throws IgniteCheckedException {
-        A.notNull(key, "key", val, "val");
-
-        if (keyCheck)
-            validateCacheKey(key);
-
-        validateCacheValue(val);
-
-        return syncOp(new SyncOp<Boolean>(true) {
-            @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException
{
-                return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, filter).get().success();
-            }
-
-            @Override public String toString() {
-                return "put [key=" + key + ", val=" + val + ", filter=" + Arrays.toString(filter)
+ ']';
-            }
-        });
-    }
-
     /** {@inheritDoc} */
     @Override public boolean putx(final K key, final V val) throws IgniteCheckedException
{
         return putx(key, val, CU.empty0(), true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/acd9c178/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 bc6792e..902c6e5 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
@@ -295,11 +295,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean putx0(K key, V val, @Nullable CacheEntryPredicate... filter)
throws IgniteCheckedException {
-        return putxAsync0(key, val, filter).get();
-    }
-
-    /** {@inheritDoc} */
     @Override public boolean putx(K key, V val,
         CacheEntryPredicate[] filter, boolean enableStat) throws IgniteCheckedException {
         return putxAsync(key, val, filter).get();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/acd9c178/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 219de5d..a8bcd55 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
@@ -393,11 +393,6 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean putx0(K key, V val, @Nullable CacheEntryPredicate... filter)
throws IgniteCheckedException {
-        return dht.putx0(key, val, filter);
-    }
-
-    /** {@inheritDoc} */
     @Override public boolean putx(K key,
         V val,
         CacheEntryPredicate[] filter, boolean enableStat) throws IgniteCheckedException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/acd9c178/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 2d53f74..4cc43ac 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
@@ -115,22 +115,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    @Override public boolean putx0(K key, V val, @Nullable CacheEntryPredicate... filter)
throws IgniteCheckedException {
-        A.notNull(key, "key", val, "val");
-
-        return (Boolean)updateAllInternal(UPDATE,
-            Collections.singleton(key),
-            Collections.singleton(val),
-            null,
-            expiryPerCall(),
-            false,
-            false,
-            filter,
-            ctx.writeThrough());
-    }
-
-    /** {@inheritDoc} */
     @Override public boolean putx(K key,
         V val,
         CacheEntryPredicate[] filter, boolean enableStat) throws IgniteCheckedException {


Mime
View raw message