Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ingite-9655-merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f13453f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f13453f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f13453f2 Branch: refs/heads/ingite-9655-merge Commit: f13453f23eed7ce215952716854d24412baea3a1 Parents: 3812164 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Jan 29 13:58:21 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Jan 29 13:58:21 2015 -0800 ---------------------------------------------------------------------- .../GridDistributedTxRemoteAdapter.java | 52 +++++++++----------- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +-- .../near/GridNearTxPrepareFuture.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 4 +- 4 files changed, 30 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f13453f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index 4a11e8e..9bf7255 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -506,41 +506,37 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> GridCacheVersion explicitVer = txEntry.drVersion(); - boolean drNeedResolve = - cacheCtx.conflictNeedResolve(cached.version(), explicitVer); + boolean drNeedResolve = + cacheCtx.conflictNeedResolve(cached.version(), explicitVer); - if (drNeedResolve) { - IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContextImpl<K, V>> - drRes = conflictResolve(op, txEntry.key(), val, valBytes, - txEntry.ttl(), txEntry.drExpireTime(), explicitVer, cached); + if (drNeedResolve) { + IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContextImpl<K, V>> + drRes = conflictResolve(op, txEntry.key(), val, valBytes, + txEntry.ttl(), txEntry.drExpireTime(), explicitVer, cached); - assert drRes != null; + assert drRes != null; - GridCacheVersionConflictContextImpl<K, V> drCtx = drRes.get2(); + GridCacheVersionConflictContextImpl<K, V> drCtx = drRes.get2(); - if (drCtx.isUseOld()) - op = NOOP; - else if (drCtx.isUseNew()) { - txEntry.ttl(drCtx.ttl()); + if (drCtx.isUseOld()) + op = NOOP; + else if (drCtx.isUseNew()) { + txEntry.ttl(drCtx.ttl()); - if (drCtx.newEntry().dataCenterId() != cacheCtx.dataCenterId()) - txEntry.drExpireTime(drCtx.expireTime()); - else - txEntry.drExpireTime(-1L); - } - else if (drCtx.isMerge()) { - op = drRes.get1(); - val = drCtx.mergeValue(); - valBytes = null; - explicitVer = writeVersion(); - - txEntry.ttl(drCtx.ttl()); + if (drCtx.newEntry().dataCenterId() != cacheCtx.dataCenterId()) + txEntry.drExpireTime(drCtx.expireTime()); + else txEntry.drExpireTime(-1L); - } } - else - // Nullify explicit version so that innerSet/innerRemove will work as usual. - explicitVer = null; + else if (drCtx.isMerge()) { + op = drRes.get1(); + val = drCtx.mergeValue(); + valBytes = null; + explicitVer = writeVersion(); + + txEntry.ttl(drCtx.ttl()); + txEntry.drExpireTime(-1L); + } } else // Nullify explicit version so that innerSet/innerRemove will work as usual. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f13453f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 4ecdac4..461c0ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -489,10 +489,10 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu onComplete(); if (!tx.colocated() && tx.markFinalizing(IgniteTxEx.FinalizationStatus.USER_FINISH)) { - IgniteFuture<IgniteTx> fut = this.err.get() == null ? tx.commitAsync() : tx.rollbackAsync(); + IgniteInternalFuture<IgniteTx> fut = this.err.get() == null ? tx.commitAsync() : tx.rollbackAsync(); - fut.listenAsync(new CIX1<IgniteFuture<IgniteTx>>() { - @Override public void applyx(IgniteFuture<IgniteTx> gridCacheTxGridFuture) { + fut.listenAsync(new CIX1<IgniteInternalFuture<IgniteTx>>() { + @Override public void applyx(IgniteInternalFuture<IgniteTx> gridCacheTxGridFuture) { try { if (replied.compareAndSet(false, true)) sendPrepareResponse(res); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f13453f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java index 6c10ed4..59e90a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java @@ -627,7 +627,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut } if (node.isLocal()) { - IgniteFuture<IgniteTxEx<K, V>> fut = cctx.tm().txHandler().prepareTx(node.id(), tx, req); + IgniteInternalFuture<IgniteTxEx<K, V>> fut = cctx.tm().txHandler().prepareTx(node.id(), tx, req); // Add new future. add(new GridEmbeddedFuture<>( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f13453f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index 6dfa1ff..6a0d200 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -728,8 +728,8 @@ public class IgniteTxHandler<K, V> { finish(nodeId, nearTx, req, req.nearTtls()); if (dhtTx != null && !dhtTx.done()) { - dhtTx.finishFuture().listenAsync(new CI1<IgniteFuture<IgniteTx>>() { - @Override public void apply(IgniteFuture<IgniteTx> igniteTxIgniteFuture) { + dhtTx.finishFuture().listenAsync(new CI1<IgniteInternalFuture<IgniteTx>>() { + @Override public void apply(IgniteInternalFuture<IgniteTx> igniteTxIgniteFuture) { sendReply(nodeId, req); } });
