ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/5] incubator-ignite git commit: #ignite-683: Remove putx(final K key, final V val, @Nullable final GridCacheEntryEx cached, @Nullable final CacheEntryPredicate... filter).
Date Wed, 08 Apr 2015 16:04:43 GMT
#ignite-683: Remove putx(final K key, final V val, @Nullable final GridCacheEntryEx cached,
@Nullable final CacheEntryPredicate... filter).


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

Branch: refs/heads/ignite-683
Commit: b48bd4bb6ec3618f61369e2c67ee6b2abd33f119
Parents: 7879d27
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Apr 8 18:01:40 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Apr 8 18:01:40 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 30 --------------------
 .../dht/atomic/GridDhtAtomicCache.java          |  6 ----
 .../distributed/near/GridNearAtomicCache.java   |  8 ------
 .../local/atomic/GridLocalAtomicCache.java      | 19 -------------
 4 files changed, 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b48bd4bb/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 2bbf033..7d6fe9f 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
@@ -2096,36 +2096,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
         return prevVal;
     }
 
-    /**
-     * Internal method that is called from {@link CacheEntryImpl}.
-     *
-     * @param key Key.
-     * @param val Value.
-     * @param cached 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");
-
-        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, cached, filter).get().success();
-            }
-
-            @Override public String toString() {
-                return "put [key=" + key + ", val=" + val + ", filter=" + Arrays.toString(filter)
+ ']';
-            }
-        });
-    }
-
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> putAsync(K key, V val) {
         return putAsync(key, val, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b48bd4bb/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 380b9a1..c928887 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
@@ -307,12 +307,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx cached,
-        @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException {
-        return putxAsync(key, val, cached, filter).get();
-    }
-
-    /** {@inheritDoc} */
     @Override public boolean putx(K key, V val,
         CacheEntryPredicate[] filter) throws IgniteCheckedException {
         return putxAsync(key, val, filter).get();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b48bd4bb/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 95807cc..fcbd9f6 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
@@ -400,14 +400,6 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     /** {@inheritDoc} */
     @Override public boolean putx(K key,
         V val,
-        @Nullable GridCacheEntryEx cached,
-        @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException {
-        return dht.putx(key, val, cached, filter);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean putx(K key,
-        V val,
         CacheEntryPredicate[] filter) throws IgniteCheckedException {
         return dht.putx(key, val, filter);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b48bd4bb/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 273a078..aa0ab56 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
@@ -118,25 +118,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    @Override public boolean putx(K key,
-        V val,
-        @Nullable GridCacheEntryEx cached,
-        @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) throws IgniteCheckedException {
         return putx(key, val, null);
     }


Mime
View raw message