all cheats rolled back, including version manager
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6abc0f43 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6abc0f43 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6abc0f43 Branch: refs/heads/ignite-comm-balance-master Commit: 6abc0f43af3ac4c9a8feb36028234c1e7899de7e Parents: d1c01d0 Author: Yakov Zhdanov <[email protected]> Authored: Mon Feb 6 17:00:40 2017 +0700 Committer: Yakov Zhdanov <[email protected]> Committed: Mon Feb 6 17:00:40 2017 +0700 ---------------------------------------------------------------------- .../managers/communication/GridIoManager.java | 37 ----------- .../discovery/GridDiscoveryManager.java | 2 +- .../GridDhtAtomicAbstractUpdateFuture.java | 11 +--- .../GridDhtAtomicAbstractUpdateRequest.java | 8 --- .../dht/atomic/GridDhtAtomicCache.java | 20 ++---- .../GridDhtAtomicSingleUpdateRequest.java | 61 +++++------------- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 66 +++++++------------- .../GridNearAtomicAbstractUpdateFuture.java | 22 ------- .../GridNearAtomicSingleUpdateFuture.java | 2 +- .../internal/util/future/GridFutureAdapter.java | 22 ------- 10 files changed, 46 insertions(+), 205 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index d38b8f8..3f9650c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -54,8 +54,6 @@ import org.apache.ignite.internal.managers.GridManagerAdapter; import org.apache.ignite.internal.managers.deployment.GridDeployment; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicAbstractUpdateFuture; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse; import org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter; import org.apache.ignite.internal.processors.pool.PoolProcessor; import org.apache.ignite.internal.processors.timeout.GridTimeoutObject; @@ -67,7 +65,6 @@ import org.apache.ignite.internal.util.lang.GridTuple3; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.X; -import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; @@ -315,8 +312,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa if (log.isDebugEnabled()) log.debug(startInfo()); - U.debug(log, "COMPLETE_IN_USER_THREAD for cache ID: " + COMPLETE_IN_USER_THREAD_ID); - addMessageListener(GridTopic.TOPIC_IO_TEST, new GridMessageListener() { @Override public void onMessage(UUID nodeId, Object msg) { ClusterNode node = ctx.discovery().node(nodeId); @@ -771,21 +766,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa } } - private static final int COMPLETE_IN_USER_THREAD_ID; - - static { - String cacheName = System.getProperty("COMPLETE_IN_USER_THREAD"); - - if (cacheName == null) - COMPLETE_IN_USER_THREAD_ID = 0; - else { - COMPLETE_IN_USER_THREAD_ID = CU.cacheId(cacheName); - - if (COMPLETE_IN_USER_THREAD_ID == 0) - throw new RuntimeException(); - } - } - /** * @param nodeId Node ID. * @param msg Message. @@ -829,23 +809,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa return; } - if (COMPLETE_IN_USER_THREAD_ID != 0 && - msg.message().directType() == 41 // instanceof GridNearAtomicUpdateResponse - ) { - GridNearAtomicUpdateResponse res = (GridNearAtomicUpdateResponse)msg.message(); - - if (res.cacheId() == COMPLETE_IN_USER_THREAD_ID) { - GridNearAtomicAbstractUpdateFuture f = - (GridNearAtomicAbstractUpdateFuture)ctx.cache().context().mvcc().atomicFuture(res.futureVersion()); - - f.completer(c); - - f.unblockAllThreads(); - - return; - } - } - if (ctx.config().getStripedPoolSize() > 0 && plc == GridIoPolicy.SYSTEM_POOL && msg.partition() != Integer.MIN_VALUE http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index a436d4e..24debc3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -1615,7 +1615,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @return Collection of cache nodes. */ public Collection<ClusterNode> cacheNodes(int cacheId, AffinityTopologyVersion topVer) { - return resolveDiscoCache(cacheId, topVer).cacheNodes(cacheId, topVer.topologyVersion()); // TODO + return resolveDiscoCache(cacheId, topVer).cacheNodes(cacheId, topVer.topologyVersion()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java index 3ee45ea..1d2c83c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java @@ -43,7 +43,6 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.CI2; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.NotNull; @@ -100,8 +99,6 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte /** Response count. */ private volatile int resCnt; - public UUID nearNodeId; - /** * @param cctx Cache context. * @param completionCb Callback to invoke when future is completed. @@ -118,9 +115,7 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte ) { this.cctx = cctx; - this.futVer = CU.cheatCache(cctx.cacheId()) ? updateReq.futureVersion() : - cctx.versions().next(updateReq.topologyVersion()); - + this.futVer = updateReq.futureVersion(); this.updateReq = updateReq; this.completionCb = completionCb; this.updateRes = updateRes; @@ -205,8 +200,6 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte conflictExpireTime, conflictVer); - updateReq.nearNodeId(nearNodeId); - mappings.put(nodeId, updateReq); } @@ -458,7 +451,7 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte clsr.apply(suc); } - if (updateReq.writeSynchronizationMode() == FULL_SYNC && !CU.cheatCache(cctx.cacheId())) + if (updateReq.writeSynchronizationMode() == FULL_SYNC) completionCb.apply(updateReq, updateRes); return true; http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java index 21d5c87..deb9ce4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java @@ -76,14 +76,6 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheMessag return nodeId; } - public UUID nearNodeId() { - return null; - } - - public void nearNodeId(UUID nearNodeId) { - - } - /** * @return Keep binary flag. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/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 9a9ab57..5fbc733 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 @@ -680,9 +680,9 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { true, false).get(); - assert res != null || CU.cheatCache(ctx.cacheId()); + assert res != null; - return CU.cheatCache(ctx.cacheId()) ? true : res; + return res; } /** {@inheritDoc} */ @@ -1905,7 +1905,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { if (req.writeSynchronizationMode() != FULL_ASYNC) req.cleanup(!node.isLocal()); - if (dhtFut != null && !CU.cheatCache(ctx.cacheId())) + if (dhtFut != null) ctx.mvcc().addAtomicFuture(dhtFut.version(), dhtFut); } else @@ -2516,8 +2516,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { if (dhtFut != null) { if (updRes.sendToDht()) { // Send to backups even in case of remove-remove scenarios. - dhtFut.nearNodeId = node.id(); //TODO - GridCacheVersionConflictContext<?, ?> conflictCtx = updRes.conflictResolveResult(); if (conflictCtx == null) @@ -3315,17 +3313,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { try { if (res.failedKeys() != null || res.nearEvicted() != null || req.writeSynchronizationMode() == FULL_SYNC) { - if (CU.cheatCache(ctx.cacheId())) { - ctx.io().send( - req.nearNodeId(), - new GridNearAtomicUpdateResponse(ctx.cacheId(), - req.nearNodeId(), - req.futureVersion(), - false), - ctx.ioPolicy()); - } - else - ctx.io().send(nodeId, res, ctx.ioPolicy()); + ctx.io().send(nodeId, res, ctx.ioPolicy()); if (msgLog.isDebugEnabled()) { msgLog.debug("Sent DHT atomic update response [futId=" + req.futureVersion() + http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java index 53c3079..a7e6c24 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java @@ -52,7 +52,6 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat private static final int NEAR_FLAG_MASK = 0x80; /** Future version. */ - @GridToStringInclude protected GridCacheVersion futVer; /** Write version. */ @@ -89,12 +88,8 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat protected long updateCntr; /** */ - @GridToStringInclude protected int partId; - @GridToStringInclude - protected UUID nearNodeId; - /** * Empty constructor required by {@link Externalizable}. */ @@ -206,14 +201,6 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat this.val = val; } - public UUID nearNodeId() { - return nearNodeId; - } - - public void nearNodeId(UUID nearNodeId) { - this.nearNodeId = nearNodeId; - } - /** {@inheritDoc} */ @Override public boolean forceTransformBackups() { return false; @@ -454,60 +441,54 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat writer.incrementState(); case 6: - if (!writer.writeUuid("nearNodeId", nearNodeId)) - return false; - - writer.incrementState(); - - case 7: if (!writer.writeInt("partId", partId)) return false; writer.incrementState(); - case 8: + case 7: if (!writer.writeMessage("prevVal", prevVal)) return false; writer.incrementState(); - case 9: + case 8: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 10: + case 9: if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; writer.incrementState(); - case 11: + case 10: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 12: + case 11: if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); - case 13: + case 12: if (!writer.writeLong("updateCntr", updateCntr)) return false; writer.incrementState(); - case 14: + case 13: if (!writer.writeMessage("val", val)) return false; writer.incrementState(); - case 15: + case 14: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -554,14 +535,6 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); case 6: - nearNodeId = reader.readUuid("nearNodeId"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 7: partId = reader.readInt("partId"); if (!reader.isLastRead()) @@ -569,7 +542,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 8: + case 7: prevVal = reader.readMessage("prevVal"); if (!reader.isLastRead()) @@ -577,7 +550,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 9: + case 8: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -585,7 +558,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 10: + case 9: byte syncModeOrd; syncModeOrd = reader.readByte("syncMode"); @@ -597,7 +570,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 11: + case 10: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -605,7 +578,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 12: + case 11: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -613,7 +586,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 13: + case 12: updateCntr = reader.readLong("updateCntr"); if (!reader.isLastRead()) @@ -621,7 +594,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 14: + case 13: val = reader.readMessage("val"); if (!reader.isLastRead()) @@ -629,7 +602,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 15: + case 14: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) @@ -679,7 +652,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 16; + return 15; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index c911a99..7144963 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -151,8 +151,6 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque /** Additional flags. */ private byte flags; - protected UUID nearNodeId; - /** * Empty constructor required by {@link Externalizable}. */ @@ -294,14 +292,6 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque conflictExpireTimes.add(conflictExpireTime); } - public UUID nearNodeId() { - return nearNodeId; - } - - public void nearNodeId(UUID nearNodeId) { - this.nearNodeId = nearNodeId; - } - /** {@inheritDoc} */ @Override public void addNearWriteValue(KeyCacheObject key, @Nullable CacheObject val, @@ -691,72 +681,66 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque writer.incrementState(); case 15: - if (!writer.writeUuid("nearNodeId", nearNodeId)) - return false; - - writer.incrementState(); - - case 16: if (!writer.writeMessage("nearTtls", nearTtls)) return false; writer.incrementState(); - case 17: + case 16: if (!writer.writeCollection("nearVals", nearVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 18: + case 17: if (!writer.writeCollection("prevVals", prevVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 19: + case 18: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 20: + case 19: if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; writer.incrementState(); - case 21: + case 20: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 22: + case 21: if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); - case 23: + case 22: if (!writer.writeMessage("ttls", ttls)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeMessage("updateCntrs", updateCntrs)) return false; writer.incrementState(); - case 25: + case 24: if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 26: + case 25: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -875,14 +859,6 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); case 15: - nearNodeId = reader.readUuid("nearNodeId"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 16: nearTtls = reader.readMessage("nearTtls"); if (!reader.isLastRead()) @@ -890,7 +866,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 17: + case 16: nearVals = reader.readCollection("nearVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -898,7 +874,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 18: + case 17: prevVals = reader.readCollection("prevVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -906,7 +882,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 19: + case 18: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -914,7 +890,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 20: + case 19: byte syncModeOrd; syncModeOrd = reader.readByte("syncMode"); @@ -926,7 +902,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 21: + case 20: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -934,7 +910,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 22: + case 21: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -942,7 +918,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 23: + case 22: ttls = reader.readMessage("ttls"); if (!reader.isLastRead()) @@ -950,7 +926,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 24: + case 23: updateCntrs = reader.readMessage("updateCntrs"); if (!reader.isLastRead()) @@ -958,7 +934,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 25: + case 24: vals = reader.readCollection("vals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -966,7 +942,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 26: + case 25: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) @@ -992,7 +968,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 27; + return 26; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java index 862e920..c92e0f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java @@ -33,7 +33,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheOperation; import org.apache.ignite.internal.processors.cache.GridCacheReturn; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.future.GridFutureAdapter; -import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.CI2; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; @@ -135,10 +134,6 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt /** Operation result. */ protected GridCacheReturn opRes; - /** */ - @GridToStringInclude - protected volatile Runnable completer; - /** * Constructor. * @@ -225,23 +220,6 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt } /** - * @param completer - */ - public void completer(Runnable completer) { - this.completer = completer; - } - - /** {@inheritDoc} */ - protected Runnable clearCompleter() { - Runnable r = completer; - - if (r != null) - completer = null; - - return r; - } - - /** * @param topVer Topology version. * @param futVer Future version */ http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index 133e42e..8759018 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java @@ -210,7 +210,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda if (!res.futureVersion().equals(futVer)) return; - if (!this.req.nodeId().equals(nodeId) && !CU.cheatCache(cctx.cacheId())) + if (!this.req.nodeId().equals(nodeId)) return; req = this.req; http://git-wip-us.apache.org/repos/asf/ignite/blob/6abc0f43/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java index dc2afd9..bd11301 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java @@ -167,20 +167,6 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> { } /** - * @return Completer. - */ - protected Runnable completer() { - return null; - } - - /** - * @return Completer and clears it. - */ - protected Runnable clearCompleter() { - return null; - } - - /** * Internal get routine. * * @param ignoreInterrupts Whether to ignore interrupts. @@ -201,14 +187,6 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> { for (; ; ) { LockSupport.park(); - Runnable r = clearCompleter(); - - if (r != null) { - r.run(); - - assert isDone(); - } - if (isDone()) return resolve(state);
