ignite-471: fixed offhep collections test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/095e3f9b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/095e3f9b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/095e3f9b Branch: refs/heads/ignite-471 Commit: 095e3f9b924279d1220d5ad8542ea4df728eba97 Parents: 4b5d9fc Author: Denis Magda <dma...@gridgain.com> Authored: Fri May 15 17:35:43 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Fri May 15 17:35:43 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheObjectContext.java | 2 -- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/GridCacheSwapManager.java | 12 ++++----- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../IgniteCacheObjectProcessorImpl.java | 28 +------------------- 7 files changed, 11 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095e3f9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java index 7b9c22e..e85a04a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cacheobject.*; -import java.nio.*; import java.util.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095e3f9b/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 57d1684..9bee148 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 @@ -1719,7 +1719,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return Cache key object. * @throws IgniteCheckedException If failed. */ - public KeyCacheObject bytesToCacheKeyObject(ByteBuffer bytes) throws IgniteCheckedException { + public KeyCacheObject toCacheKeyObject(ByteBuffer bytes) throws IgniteCheckedException { Object obj = ctx.cacheObjects().unmarshal(cacheObjCtx, bytes, deploy().localLoader()); return cacheObjects().toCacheKeyObject(cacheObjCtx, obj, false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095e3f9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 1bcae08..66af317 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2375,7 +2375,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (qryMgr != null) { try { - KeyCacheObject key = cctx.bytesToCacheKeyObject(ByteBuffer.wrap(keyBytes)); + KeyCacheObject key = cctx.toCacheKeyObject(ByteBuffer.wrap(keyBytes)); GridCacheSwapEntry swapEntry = GridCacheSwapEntryImpl.unmarshal(valBytes); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095e3f9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index be85b5d..332cbc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -120,7 +120,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { if (!firstEvictWarn) warnFirstEvict(); - writeToSwap(part, cctx.bytesToCacheKeyObject(ByteBuffer.wrap(kb)), vb); + writeToSwap(part, cctx.toCacheKeyObject(ByteBuffer.wrap(kb)), vb); } catch (IgniteCheckedException e) { log.error("Failed to unmarshal off-heap entry [part=" + part + ", hash=" + hash + ']', e); @@ -818,7 +818,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { if (entry == null) return; - KeyCacheObject key = cctx.bytesToCacheKeyObject(ByteBuffer.wrap(swapKey.keyBytes())); + KeyCacheObject key = cctx.toCacheKeyObject(ByteBuffer.wrap(swapKey.keyBytes())); GridCacheBatchSwapEntry unswapped = new GridCacheBatchSwapEntry(key, swapKey.partition(), @@ -1274,7 +1274,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { @Override protected void onRemove() throws IgniteCheckedException { if (offheapFlag) { - KeyCacheObject key = cctx.bytesToCacheKeyObject(ByteBuffer.wrap(cur.getKey())); + KeyCacheObject key = cctx.toCacheKeyObject(ByteBuffer.wrap(cur.getKey())); int part = cctx.affinity().partition(key); @@ -1402,7 +1402,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { cur = new Map.Entry<K, V>() { @Override public K getKey() { try { - KeyCacheObject key = cctx.bytesToCacheKeyObject(ByteBuffer.wrap(cur0.getKey())); + KeyCacheObject key = cctx.toCacheKeyObject(ByteBuffer.wrap(cur0.getKey())); return key.value(cctx.cacheObjectContext(), false); } @@ -1496,7 +1496,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { @Override protected KeyCacheObject onNext() { try { - cur = cctx.bytesToCacheKeyObject(ByteBuffer.wrap(it.next().getKey())); + cur = cctx.toCacheKeyObject(ByteBuffer.wrap(it.next().getKey())); return cur; } @@ -1646,7 +1646,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { } @Override protected void onRemove() throws IgniteCheckedException { - KeyCacheObject key = cctx.bytesToCacheKeyObject(ByteBuffer.wrap(cur.getKey())); + KeyCacheObject key = cctx.toCacheKeyObject(ByteBuffer.wrap(cur.getKey())); int part = cctx.affinity().partition(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095e3f9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index bcd8e45..94a78e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -504,7 +504,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition> byte[] keyBytes = entry.getKey(); - KeyCacheObject key = cctx.bytesToCacheKeyObject(ByteBuffer.wrap(keyBytes)); + KeyCacheObject key = cctx.toCacheKeyObject(ByteBuffer.wrap(keyBytes)); cctx.swap().remove(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095e3f9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 573f373..b40d3ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -2313,7 +2313,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte if (key != null) return key; - key = cctx.bytesToCacheKeyObject(keyBytes()).value(cctx.cacheObjectContext(), false); + key = cctx.toCacheKeyObject(keyBytes()).value(cctx.cacheObjectContext(), false); return key; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095e3f9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 37b4588..0c43a8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -28,12 +28,10 @@ import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; -import org.jsr166.*; import java.math.*; import java.nio.*; import java.util.*; -import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMemoryMode.*; @@ -47,9 +45,6 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme /** Immutable classes. */ private static final Collection<Class<?>> IMMUTABLE_CLS = new HashSet<>(); - /** */ - private final ConcurrentMap<String, CacheObjectContext> contexts = new ConcurrentHashMap8<>(); - /** * */ @@ -195,27 +190,6 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme @Override public CacheObjectContext contextForCache(CacheConfiguration ccfg) { assert ccfg != null; - String cacheName = U.maskName(ccfg.getName()); - - CacheObjectContext ctx = contexts.get(cacheName); - - if (ctx == null) { - CacheObjectContext old = contexts.putIfAbsent(cacheName, ctx = createContext(ccfg)); - - if (old != null) - ctx = old; - } - - return ctx; - } - - /** - * @param ccfg Configuration. - * @return New cache context. - */ - protected CacheObjectContext createContext(CacheConfiguration ccfg) { - assert ccfg != null; - CacheMemoryMode memMode = ccfg.getMemoryMode(); boolean storeVal = ctx.config().isPeerClassLoadingEnabled() || @@ -224,7 +198,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme return new CacheObjectContext(ctx, ccfg.getAffinityMapper() != null ? ccfg.getAffinityMapper() : new GridCacheDefaultAffinityKeyMapper(), - ccfg.isCopyOnRead() && memMode == ONHEAP_TIERED, + ccfg.isCopyOnRead() && memMode != OFFHEAP_VALUES, storeVal); }
