You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/31 15:27:06 UTC
[2/6] ignite git commit: UPDATE: Removed conflict collections.
UPDATE: Removed conflict collections.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c0bc129
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c0bc129
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c0bc129
Branch: refs/heads/ignite-2925
Commit: 8c0bc129156f0226c72aeef613e1c43fda997a1f
Parents: e680475
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Mar 31 15:51:24 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Mar 31 15:51:24 2016 +0300
----------------------------------------------------------------------
.../distributed/dht/atomic/GridDhtAtomicCache.java | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8c0bc129/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 c08a24d..95a6014 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
@@ -448,8 +448,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
return updateAsync0(F0.asMap(key, val),
null,
null,
- null,
- null,
true,
false,
filter,
@@ -465,8 +463,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
return updateAsync0(F0.asMap(key, val),
null,
null,
- null,
- null,
false,
false,
filter,
@@ -481,8 +477,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
return (V)updateAsync0(F0.asMap(key, val),
null,
null,
- null,
- null,
true,
false,
ctx.noValArray(),
@@ -561,8 +555,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
return updateAsync0(F.asMap(key, newVal),
null,
null,
- null,
- null,
true,
true,
ctx.equalsValArray(oldVal),
@@ -783,8 +775,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> fut = updateAsync0(null,
invokeMap,
args,
- null,
- null,
false,
false,
null,
@@ -890,15 +880,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
@Nullable Map<? extends K, ? extends V> map,
@Nullable Map<? extends K, ? extends EntryProcessor> invokeMap,
@Nullable Object[] invokeArgs,
- @Nullable Map<KeyCacheObject, GridCacheDrInfo> conflictPutMap,
- @Nullable Map<KeyCacheObject, GridCacheVersion> conflictRmvMap,
final boolean retval,
final boolean rawRetval,
@Nullable final CacheEntryPredicate[] filter,
final boolean waitTopFut,
final GridCacheOperation op
) {
- return updateAllAsync0(map, invokeMap, invokeArgs, conflictPutMap, conflictRmvMap, retval, rawRetval, filter, waitTopFut, op);
+ return updateAllAsync0(map, invokeMap, invokeArgs, null, null, retval, rawRetval, filter, waitTopFut, op);
}
/**