IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29188822 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29188822 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29188822 Branch: refs/heads/ignite-426 Commit: 29188822bc4154b0a6abfc4a215a5aedc5c4206b Parents: 19ff9a5 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Aug 4 18:28:58 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Aug 4 18:28:58 2015 -0700 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29188822/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index fb004bf..b6348f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -2317,7 +2317,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract GridCacheEntryEx entry = cctx.isNear() ? cctx.near().dht().peekEx(key) : cctx.cache().peekEx(key); - if (grid(idx).affinity(null).mapKeyToPrimaryAndBackups(key).contains(grid(idx).localNode())) { + if (atomicityMode() != ATOMIC && + grid(idx).affinity(null).mapKeyToPrimaryAndBackups(key).contains(grid(idx).localNode())) { assertNotNull(entry); assertTrue(entry.deleted()); } @@ -3394,8 +3395,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract // Ensure that old TTL and expire time are not longer "visible". entry = internalCache.peekEx(key); - assertEquals(0, entry.ttl()); - assertEquals(0, entry.expireTime()); + if (atomicityMode() == ATOMIC) + assertNull(entry); + else { + assertEquals(0, entry.ttl()); + assertEquals(0, entry.expireTime()); + } // Ensure that next update will not pick old expire time.
