WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/44ec58c9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/44ec58c9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/44ec58c9 Branch: refs/heads/ignite-2926 Commit: 44ec58c95087409540be44af164acb06c8e50529 Parents: b3285e2 Author: vozerov-gridgain <[email protected]> Authored: Fri Apr 15 12:22:46 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Apr 15 12:22:46 2016 +0300 ---------------------------------------------------------------------- .../GridAbstractNearAtomicUpdateFuture.java | 33 ++++++++++++++++++++ .../dht/atomic/GridNearAtomicUpdateFuture.java | 30 ------------------ 2 files changed, 33 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/44ec58c9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAbstractNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAbstractNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAbstractNearAtomicUpdateFuture.java index e40e8ca..3088d05 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAbstractNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAbstractNearAtomicUpdateFuture.java @@ -22,12 +22,15 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; +import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException; import org.apache.ignite.internal.processors.cache.GridCacheAffinityManager; import org.apache.ignite.internal.processors.cache.GridCacheAtomicFuture; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheMvccManager; import org.apache.ignite.internal.processors.cache.GridCacheOperation; +import org.apache.ignite.internal.processors.cache.GridCacheReturn; import org.apache.ignite.internal.processors.cache.KeyCacheObject; +import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.CU; @@ -105,6 +108,36 @@ public abstract class GridAbstractNearAtomicUpdateFuture extends GridFutureAdapt /** Mutex to synchronize state updates. */ protected final Object mux = new Object(); + /** Topology locked flag. Set if atomic update is performed inside a TX or explicit lock. */ + protected boolean topLocked; + + /** Remap count. */ + protected int remapCnt; + + /** Current topology version. */ + protected AffinityTopologyVersion topVer = AffinityTopologyVersion.ZERO; + + /** */ + protected GridCacheVersion updVer; + + /** Topology version when got mapping error. */ + protected AffinityTopologyVersion mapErrTopVer; + + /** */ + protected int resCnt; + + /** Error. */ + protected CachePartialUpdateCheckedException err; + + /** Future ID. */ + protected GridCacheVersion futVer; + + /** Completion future for a particular topology version. */ + protected GridFutureAdapter<Void> topCompleteFut; + + /** Operation result. */ + protected GridCacheReturn opRes; + /** * Constructor. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/44ec58c9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index d68b4ef..bf7b0e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -81,46 +81,16 @@ public class GridNearAtomicUpdateFuture extends GridAbstractNearAtomicUpdateFutu @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) private Collection<GridCacheVersion> conflictRmvVals; - /** Topology locked flag. Set if atomic update is performed inside a TX or explicit lock. */ - private boolean topLocked; - - /** Remap count. */ - private int remapCnt; - - /** Current topology version. */ - private AffinityTopologyVersion topVer = AffinityTopologyVersion.ZERO; - - /** */ - private GridCacheVersion updVer; - - /** Topology version when got mapping error. */ - private AffinityTopologyVersion mapErrTopVer; - /** Mappings if operations is mapped to more than one node. */ @GridToStringInclude private Map<UUID, GridNearAtomicUpdateRequest> mappings; - /** */ - private int resCnt; - - /** Error. */ - private CachePartialUpdateCheckedException err; - - /** Future ID. */ - private GridCacheVersion futVer; - - /** Completion future for a particular topology version. */ - private GridFutureAdapter<Void> topCompleteFut; - /** Keys to remap. */ private Collection<KeyCacheObject> remapKeys; /** Not null is operation is mapped to single node. */ private GridNearAtomicUpdateRequest singleReq; - /** Operation result. */ - private GridCacheReturn opRes; - /** * @param cctx Cache context. * @param cache Cache instance.
