Repository: ignite Updated Branches: refs/heads/ignite-4932 f2d9ea0cc -> 17a8d844b
ignite-4932 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/17a8d844 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/17a8d844 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/17a8d844 Branch: refs/heads/ignite-4932 Commit: 17a8d844b11f493d0ba9530e2316b3ba2e4dc3ab Parents: f2d9ea0 Author: sboikov <[email protected]> Authored: Thu Apr 13 11:03:28 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 13 11:03:28 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheConcurrentMapImpl.java | 1 - .../ignite/internal/processors/cache/GridCacheContext.java | 6 +++--- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 7 +++++-- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/17a8d844/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java index c91372d..3830d47 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java @@ -111,7 +111,6 @@ public class GridCacheConcurrentMapImpl implements GridCacheConcurrentMap { /** {@inheritDoc} */ @Nullable @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(final AffinityTopologyVersion topVer, KeyCacheObject key, final boolean create, final boolean touch) { - GridCacheMapEntry cur = null; GridCacheMapEntry created = null; GridCacheMapEntry created0 = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/17a8d844/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 b4668a0..ae8e5a5 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 @@ -2058,9 +2058,9 @@ public class GridCacheContext<K, V> implements Externalizable { } /** - * @param expiryPlc - * @param readers - * @return + * @param expiryPlc Expiry policy for read operation. + * @param readers {@code True} if need update entry readers. + * @return {@code True} if it is possible directly read offheap instead of using {@link GridCacheEntryEx#innerGet}. */ public boolean offheapRead(IgniteCacheExpiryPolicy expiryPlc, boolean readers) { return offheapTiered() && http://git-wip-us.apache.org/repos/asf/ignite/blob/17a8d844/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 00e5199..8e2a8ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -140,7 +140,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme /** Value. */ @GridToStringInclude - protected CacheObject val; + protected volatile CacheObject val; /** Start version. */ @GridToStringInclude @@ -874,7 +874,10 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme Object res = null; - if (readerArgs == null && (expiryPlc == null || !expiryPlc.hasAccessTtl()) && !retVer && cctx.config().isEagerTtl()) { + if (readerArgs == null && + (expiryPlc == null || !expiryPlc.hasAccessTtl()) && + !retVer && + cctx.config().isEagerTtl()) { // Fast heap get without 'synchronized'. CacheObject val0 = this.val;
