You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2016/01/19 11:59:29 UTC

[38/38] ignite git commit: IGNITE-10837 WIP

IGNITE-10837 WIP


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

Branch: refs/heads/ignite-gg-10837
Commit: 93c97e3342f7b4d28a4a687d692ea04bba5b915a
Parents: 2a1a4cd
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Jan 19 13:58:42 2016 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Jan 19 13:58:42 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 17 --------------
 .../processors/cache/GridCacheProxyImpl.java    | 13 -----------
 .../processors/cache/IgniteCacheProxy.java      | 24 --------------------
 .../processors/cache/IgniteInternalCache.java   | 11 ---------
 .../distributed/near/GridNearAtomicCache.java   |  6 -----
 .../transactions/IgniteTxLocalAdapter.java      | 21 -----------------
 .../cache/transactions/IgniteTxLocalEx.java     | 10 --------
 7 files changed, 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/93c97e33/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 704888c..2582e6c 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
@@ -2085,23 +2085,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
     }
 
     /** {@inheritDoc} */
-    @Override public void invokeAllConflict(final Map<KeyCacheObject, GridCacheDrInfo> map,
-        final Object... args) throws IgniteCheckedException {
-        if (F.isEmpty(map))
-            return;
-
-        syncOp(new SyncInOp(map.size() == 1) {
-            @Override public void inOp(IgniteTxLocalAdapter tx) throws IgniteCheckedException {
-                tx.invokeAllDrAsync(ctx, map, args).get();
-            }
-
-            @Override public String toString() {
-                return "invokeAllDrAsync [drMap=" + map + ']';
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
     @Override public <T> EntryProcessorResult<T> invoke(final K key,
         final EntryProcessor<K, V, T> entryProcessor,
         final Object... args) throws IgniteCheckedException {

http://git-wip-us.apache.org/repos/asf/ignite/blob/93c97e33/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 eaf4437..8ffd273 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
@@ -524,19 +524,6 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     }
 
     /** {@inheritDoc} */
-    @Override public void invokeAllConflict(Map<KeyCacheObject, GridCacheDrInfo> map,
-        Object... args) throws IgniteCheckedException {
-        CacheOperationContext prev = gate.enter(opCtx);
-
-        try {
-            delegate.invokeAllConflict(map, args);
-        }
-        finally {
-            gate.leave(prev);
-        }
-    }
-
-    /** {@inheritDoc} */
     @Override public <T> EntryProcessorResult<T> invoke(K key,
         EntryProcessor<K, V, T> entryProcessor,
         Object... args) throws IgniteCheckedException {

http://git-wip-us.apache.org/repos/asf/ignite/blob/93c97e33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 228f795..8cf7285 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -1128,30 +1128,6 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
         }
     }
 
-    /**
-     * Invoke entries from cache with conflict resolution.
-     *
-     * @param map Conflict map.
-     * @param args Invoke arguments.
-     */
-    public void invokeAllConflict(Map<KeyCacheObject, GridCacheDrInfo> map, Object... args) {
-        try {
-            GridCacheGateway<K, V> gate = this.gate;
-
-            CacheOperationContext prev = onEnter(gate, opCtx);
-
-            try {
-                delegate.invokeAllConflict(map, args);
-            }
-            finally {
-                onLeave(gate, prev);
-            }
-        }
-        catch (IgniteCheckedException e) {
-            throw cacheException(e);
-        }
-    }
-
     /** {@inheritDoc} */
     @Override public V getAndPut(K key, V val) {
         try {

http://git-wip-us.apache.org/repos/asf/ignite/blob/93c97e33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
index d51d6e2..433290c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
@@ -1558,17 +1558,6 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> {
         throws IgniteCheckedException;
 
     /**
-     * Invoke with conflict resolution.
-     *
-     * @param map Map containing keys and entry processors to be applied to values.
-     * @param args Arguments.
-     * @return Invoke results.
-     * @throws IgniteCheckedException If failed.
-     */
-    public void invokeAllConflict(Map<KeyCacheObject, GridCacheDrInfo> map, Object... args)
-        throws IgniteCheckedException;
-
-    /**
      * Removes DR data.
      *
      * @param drMap DR map.

http://git-wip-us.apache.org/repos/asf/ignite/blob/93c97e33/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 d33a6f2..a2d5adb 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
@@ -548,12 +548,6 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
     }
 
     /** {@inheritDoc} */
-    @Override public void invokeAllConflict(Map<KeyCacheObject, GridCacheDrInfo> map,
-        Object... args) throws IgniteCheckedException {
-        dht.invokeAllConflict(map, args);
-    }
-
-    /** {@inheritDoc} */
     @Override public <T> EntryProcessorResult<T> invoke(K key,
         EntryProcessor<K, V, T> entryProcessor,
         Object... args) throws IgniteCheckedException {

http://git-wip-us.apache.org/repos/asf/ignite/blob/93c97e33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 3194c20..2bfbcfd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -1994,27 +1994,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<?> invokeAllDrAsync(GridCacheContext cacheCtx,
-        Map<KeyCacheObject, GridCacheDrInfo> drMap,
-        Object... args
-    ) {
-        Map<Object, EntryProcessor<Object, Object, Object>> invokeMap =
-            F.viewReadOnly(drMap, (IgniteClosure)new IgniteClosure<Object, EntryProcessor<Object, Object, Object>>() {
-                @Override public EntryProcessor<Object, Object, Object> apply(Object val) {
-                    return (EntryProcessor<Object, Object, Object>)((GridCacheDrInfo)val).entryProcessor();
-                }
-            });
-
-        return this.<Object, Object>putAllAsync0(cacheCtx,
-            null,
-            invokeMap,
-            args,
-            drMap,
-            true,
-            null);
-    }
-
-    /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public <K, V, T> IgniteInternalFuture<GridCacheReturn> invokeAsync(
         GridCacheContext cacheCtx,

http://git-wip-us.apache.org/repos/asf/ignite/blob/93c97e33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
index 2895a81..a5d3373 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
@@ -156,16 +156,6 @@ public interface IgniteTxLocalEx extends IgniteInternalTx {
 
     /**
      * @param cacheCtx Cache context.
-     * @param drMap DR map to put.
-     * @return Future for DR put operation.
-     */
-    public IgniteInternalFuture<?> invokeAllDrAsync(
-        GridCacheContext cacheCtx,
-        Map<KeyCacheObject, GridCacheDrInfo> drMap,
-        Object... args);
-
-    /**
-     * @param cacheCtx Cache context.
      * @param drMap DR map.
      * @return Future for asynchronous remove.
      */