Repository: incubator-ignite Updated Branches: refs/heads/ignite-283-tx 69b4540f1 -> 29684e3ae
# IGNITE-283: Fixes (4). Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29684e3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29684e3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29684e3a Branch: refs/heads/ignite-283-tx Commit: 29684e3ae521f1c579ac892c97f69a8011a42947 Parents: 69b4540 Author: vozerov <voze...@gridgain.com> Authored: Tue Feb 24 12:06:47 2015 +0300 Committer: vozerov <voze...@gridgain.com> Committed: Tue Feb 24 12:06:47 2015 +0300 ---------------------------------------------------------------------- .../GridDistributedTxRemoteAdapter.java | 26 +++++++++----------- .../transactions/IgniteTxLocalAdapter.java | 8 ++---- 2 files changed, 13 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29684e3a/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 473d025..dbf82dd 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 @@ -514,7 +514,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> boolean conflictNeedResolve = cacheCtx.conflictNeedResolve(); - GridCacheVersionConflictContext<K, V> drCtx = null; + GridCacheVersionConflictContext<K, V> conflictCtx = null; if (conflictNeedResolve) { IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContext<K, V>> @@ -522,26 +522,22 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> assert drRes != null; - drCtx = drRes.get2(); + conflictCtx = drRes.get2(); - if (drCtx.isUseOld()) + if (conflictCtx.isUseOld()) op = NOOP; - else if (drCtx.isUseNew()) { - txEntry.ttl(drCtx.ttl()); - - if (drCtx.newEntry().dataCenterId() != cacheCtx.dataCenterId()) - txEntry.conflictExpireTime(drCtx.expireTime()); - else - txEntry.conflictExpireTime(CU.EXPIRE_TIME_CALCULATE); + else if (conflictCtx.isUseNew()) { + txEntry.ttl(conflictCtx.ttl()); + txEntry.conflictExpireTime(conflictCtx.expireTime()); } - else if (drCtx.isMerge()) { + else if (conflictCtx.isMerge()) { op = drRes.get1(); - val = drCtx.mergeValue(); + val = conflictCtx.mergeValue(); valBytes = null; explicitVer = writeVersion(); - txEntry.ttl(drCtx.ttl()); - txEntry.conflictExpireTime(CU.EXPIRE_TIME_CALCULATE); + txEntry.ttl(conflictCtx.ttl()); + txEntry.conflictExpireTime(conflictCtx.expireTime()); } } else @@ -614,7 +610,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> "Transaction does not own lock for group lock entry during commit [tx=" + this + ", txEntry=" + txEntry + ']'; - if (drCtx == null || !drCtx.isUseOld()) { + if (conflictCtx == null || !conflictCtx.isUseOld()) { if (txEntry.ttl() != CU.TTL_NOT_CHANGED) cached.updateTtl(null, txEntry.ttl()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29684e3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index e2932f0..e3f777d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -779,11 +779,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> op = NOOP; else if (conflictCtx.isUseNew()) { txEntry.ttl(conflictCtx.ttl()); - - if (conflictCtx.newEntry().dataCenterId() != cctx.dataCenterId()) - txEntry.conflictExpireTime(conflictCtx.expireTime()); - else - txEntry.conflictExpireTime(CU.EXPIRE_TIME_CALCULATE); + txEntry.conflictExpireTime(conflictCtx.expireTime()); } else { assert conflictCtx.isMerge(); @@ -794,7 +790,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> explicitVer = writeVersion(); txEntry.ttl(conflictCtx.ttl()); - txEntry.conflictExpireTime(CU.EXPIRE_TIME_CALCULATE); + txEntry.conflictExpireTime(conflictCtx.expireTime()); } } else
