ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [1/5] incubator-ignite git commit: # IGNITE-283: Reverting TX cache changes.
Date Fri, 20 Feb 2015 07:04:43 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-283-tx d0ba20a58 -> 0336d5760


# IGNITE-283: Reverting TX cache changes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18259433
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18259433
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18259433

Branch: refs/heads/ignite-283-tx
Commit: 182594330c48e4f43dc4f2edbe1c7645052b9a1c
Parents: d0ba20a
Author: vozerov <vozerov@gridgain.com>
Authored: Thu Feb 19 15:58:30 2015 +0300
Committer: vozerov <vozerov@gridgain.com>
Committed: Thu Feb 19 15:58:30 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/transactions/IgniteTxEntry.java    | 12 ++----------
 .../cache/transactions/IgniteTxLocalAdapter.java        |  8 ++++----
 2 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18259433/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 0f1366b..1416d8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -852,17 +852,10 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware,
Externalizable,
         val.writeTo(out);
 
         out.writeLong(ttl);
+        out.writeLong(conflictExpireTime);
 
         CU.writeVersion(out, explicitVer);
         out.writeBoolean(grpLock);
-
-        if (conflictExpireTime != CU.EXPIRE_TIME_CALCULATE) {
-            out.writeBoolean(true);
-            out.writeLong(conflictExpireTime);
-        }
-        else
-            out.writeBoolean(false);
-
         CU.writeVersion(out, conflictVer);
 
         out.writeObject(transferExpiryPlc ? new IgniteExternalizableExpiryPolicy(expiryPlc)
: null);
@@ -889,11 +882,10 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware,
Externalizable,
         val.readFrom(in);
 
         ttl = in.readLong();
+        conflictExpireTime = in.readLong();
 
         explicitVer = CU.readVersion(in);
         grpLock = in.readBoolean();
-
-        conflictExpireTime = in.readBoolean() ? in.readLong() : CU.EXPIRE_TIME_CALCULATE;
         conflictVer = CU.readVersion(in);
 
         expiryPlc = (ExpiryPolicy)in.readObject();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18259433/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 424b74a..2da1bb7 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
@@ -3257,10 +3257,8 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K,
V>
 
         IgniteTxEntry<K, V> e = entry(key);
 
-        if (e != null) {
+        if (e != null)
             e.expiry(expiryPlc);
-            e.conflictExpireTime(CU.EXPIRE_TIME_CALCULATE);
-        }
     }
 
     /**
@@ -3277,8 +3275,10 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K,
V>
 
         if (e != null) {
             e.ttl(ttl);
-            e.expiry(null);
+
             e.conflictExpireTime(expireTime);
+
+            e.expiry(null);
         }
 
         return e != null;


Mime
View raw message