ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/8] ignite git commit: IGNITE-3699: reverting back changes in GridDhtPrepareFuture
Date Fri, 09 Dec 2016 09:57:37 GMT
IGNITE-3699: reverting back changes in GridDhtPrepareFuture


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

Branch: refs/heads/ignite-3699
Commit: 7d1b9dcff93c35b6b64820e0c3cf20cf96bb866e
Parents: b1d2d60
Author: Amir Akhmedov <amir.akhmedov@gmail.com>
Authored: Fri Nov 25 14:27:32 2016 -0500
Committer: Amir Akhmedov <amir.akhmedov@gmail.com>
Committed: Fri Nov 25 14:27:32 2016 -0500

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java | 4 +---
 .../expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java     | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7d1b9dcf/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 a6f9033..3cb0fbc 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
@@ -432,9 +432,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
 
                             if (op == NOOP) {
                                 if (expiry != null) {
-                                    long ttl = txEntry.previousValue() == null ?
-                                            CU.toTtl(expiry.getExpiryForCreation()) :
-                                            CU.toTtl(expiry.getExpiryForAccess());
+                                    long ttl = CU.toTtl(expiry.getExpiryForAccess());
 
                                     txEntry.ttl(ttl);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7d1b9dcf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
index a88443e..910769e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
@@ -25,6 +25,7 @@ import javax.cache.integration.CompletionListenerFuture;
 import javax.cache.processor.EntryProcessor;
 import javax.cache.processor.MutableEntry;
 import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CachePeekMode;
 import org.apache.ignite.cache.store.CacheStore;
 import org.apache.ignite.configuration.CacheConfiguration;
@@ -141,6 +142,9 @@ public abstract class IgniteCacheExpiryPolicyWithStoreAbstractTest extends
Ignit
      * @throws Exception If failed.
      */
     public void testReadThrough() throws Exception {
+        if (atomicityMode() == CacheAtomicityMode.TRANSACTIONAL)
+            fail("https://issues.apache.org/jira/browse/IGNITE-821");
+
         IgniteCache<Integer, Integer> cache = jcache(0);
 
         final Integer key = primaryKeys(cache, 1, 100_000).get(0);


Mime
View raw message