Merge remote-tracking branch 'remotes/origin/master' into ignite-5009 # Conflicts: # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/61021b10 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/61021b10 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/61021b10 Branch: refs/heads/ignite-5009 Commit: 61021b109ccef68568a5efc43eb9e0948909985c Parents: 658aadc Author: sboikov <sboi...@gridgain.com> Authored: Fri May 5 12:44:59 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri May 5 12:44:59 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 8 -------- .../ignite/internal/processors/cache/GridCacheContext.java | 2 +- .../internal/processors/cache/IgniteCacheExpiryPolicy.java | 5 ----- .../distributed/dht/atomic/GridDhtAtomicCacheEntry.java | 1 - .../dht/colocated/GridDhtColocatedCacheEntry.java | 1 - .../processors/cache/IgniteCacheNoSyncForGetTest.java | 5 +++-- .../cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java | 2 +- 7 files changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/61021b10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 60faaff..60842f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -5622,10 +5622,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V return CU.toTtl(expiryPlc.getExpiryForAccess()); } - @Override public boolean hasAccessTtl() { - return CU.toTtl(expiryPlc.getExpiryForAccess()) != CU.TTL_NOT_CHANGED; - } - @Override public long forCreate() { return CU.toTtl(expiryPlc.getExpiryForCreation()); } @@ -5654,10 +5650,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V return accessTtl; } - @Override public boolean hasAccessTtl() { - return accessTtl != CU.TTL_NOT_CHANGED; - } - /** {@inheritDoc} */ @Override public long forUpdate() { return CU.TTL_NOT_CHANGED; http://git-wip-us.apache.org/repos/asf/ignite/blob/61021b10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index d970684..1b3b57b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -2043,7 +2043,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return {@code True} if it is possible directly read offheap instead of using {@link GridCacheEntryEx#innerGet}. */ public boolean readNoEntry(IgniteCacheExpiryPolicy expiryPlc, boolean readers) { - return !readers && (expiryPlc == null || !expiryPlc.hasAccessTtl()); + return !readers && expiryPlc == null; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/61021b10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java index 96f1c6f..f82c5f0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java @@ -46,11 +46,6 @@ public interface IgniteCacheExpiryPolicy { public long forAccess(); /** - * @return {@code True} if expiry policy change ttl on entry read. - */ - public boolean hasAccessTtl(); - - /** * Callback for ttl update on entry access. * * @param key Entry key. http://git-wip-us.apache.org/repos/asf/ignite/blob/61021b10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java index d3aca1f..b0c9a64 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry; http://git-wip-us.apache.org/repos/asf/ignite/blob/61021b10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java index f2ff2d3..f7cc5a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.colocated; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry; http://git-wip-us.apache.org/repos/asf/ignite/blob/61021b10/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java index 4e2c534..13490c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java @@ -115,9 +115,10 @@ public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest { */ private void getTest(CacheAtomicityMode atomicityMode) throws Exception { boolean getAll[] = {true, false}; - boolean cfgExpiryPlc[] = {true, false}; - boolean withExpiryPlc[] = {true, false}; + boolean cfgExpiryPlc[] = {false}; + boolean withExpiryPlc[] = {false}; boolean heapCache[] = {true, false}; + for (boolean getAll0 : getAll) { for (boolean expiryPlc0 : cfgExpiryPlc) { for (boolean withExpiryPlc0 : withExpiryPlc) { http://git-wip-us.apache.org/repos/asf/ignite/blob/61021b10/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 6186352..2b79367 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -1009,7 +1009,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs if (cacheMode() != PARTITIONED) return; - factory = CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS,2)); + factory = CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, 2)); nearCache = true;
