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/04/25 13:05:46 UTC
ignite git commit: Removed single future. Will that help?
Repository: ignite
Updated Branches:
refs/heads/ignite-2523-remap-issue 2c88d7337 -> d8241cbfb
Removed single future. Will that help?
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8241cbf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8241cbf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8241cbf
Branch: refs/heads/ignite-2523-remap-issue
Commit: d8241cbfb675e49d6858a09b1bf2a7233cd92ab6
Parents: 2c88d73
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Apr 25 14:05:35 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Apr 25 14:05:35 2016 +0300
----------------------------------------------------------------------
.../dht/atomic/GridDhtAtomicCache.java | 46 ++++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8241cbf/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 d28aaaa..4a5edc9 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
@@ -1093,28 +1093,28 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
CacheEntryPredicate[] filters = CU.filterArray(filter);
- if (conflictPutVal == null && conflictRmvVer == null && !isFastMap(filters, op)) {
- return new GridNearAtomicSingleUpdateFuture(
- ctx,
- this,
- ctx.config().getWriteSynchronizationMode(),
- op,
- key,
- val0,
- invokeArgs,
- retval,
- false,
- opCtx != null ? opCtx.expiry() : null,
- filters,
- ctx.subjectIdPerCall(null, opCtx),
- ctx.kernalContext().job().currentTaskNameHash(),
- opCtx != null && opCtx.skipStore(),
- opCtx != null && opCtx.isKeepBinary(),
- opCtx != null && opCtx.noRetries() ? 1 : MAX_RETRIES,
- waitTopFut
- );
- }
- else {
+// if (conflictPutVal == null && conflictRmvVer == null && !isFastMap(filters, op)) {
+// return new GridNearAtomicSingleUpdateFuture(
+// ctx,
+// this,
+// ctx.config().getWriteSynchronizationMode(),
+// op,
+// key,
+// val0,
+// invokeArgs,
+// retval,
+// false,
+// opCtx != null ? opCtx.expiry() : null,
+// filters,
+// ctx.subjectIdPerCall(null, opCtx),
+// ctx.kernalContext().job().currentTaskNameHash(),
+// opCtx != null && opCtx.skipStore(),
+// opCtx != null && opCtx.isKeepBinary(),
+// opCtx != null && opCtx.noRetries() ? 1 : MAX_RETRIES,
+// waitTopFut
+// );
+// }
+// else {
return new GridNearAtomicUpdateFuture(
ctx,
this,
@@ -1135,7 +1135,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
opCtx != null && opCtx.isKeepBinary(),
opCtx != null && opCtx.noRetries() ? 1 : MAX_RETRIES,
waitTopFut);
- }
+// }
}
/**