Repository: ignite Updated Branches: refs/heads/ignite-5009 52aa0ab40 -> 8ff65316d
ignite-5009 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ff65316 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ff65316 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ff65316 Branch: refs/heads/ignite-5009 Commit: 8ff65316d519a9e9d67bd7a5568d0ef8024bde15 Parents: 52aa0ab Author: sboikov <[email protected]> Authored: Mon Apr 24 16:15:48 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Apr 24 16:15:48 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 3 +-- .../processors/cache/GridCacheConcurrentMap.java | 2 -- .../processors/cache/GridCacheConcurrentMapImpl.java | 5 ++--- .../internal/processors/cache/GridCacheMapEntry.java | 14 ++------------ .../processors/cache/GridCacheMapEntryFactory.java | 6 +----- .../processors/cache/GridNoStorageCacheMap.java | 8 +++++--- .../cache/distributed/GridDistributedCacheEntry.java | 8 ++------ .../dht/GridCachePartitionedConcurrentMap.java | 10 ++++++---- .../cache/distributed/dht/GridDhtCacheAdapter.java | 8 +++----- .../cache/distributed/dht/GridDhtCacheEntry.java | 8 ++------ .../cache/distributed/dht/GridDhtLocalPartition.java | 4 +++- .../distributed/dht/atomic/GridDhtAtomicCache.java | 6 ++---- .../dht/atomic/GridDhtAtomicCacheEntry.java | 10 +++------- .../dht/colocated/GridDhtColocatedCache.java | 6 ++---- .../dht/colocated/GridDhtColocatedCacheEntry.java | 10 +++------- .../dht/colocated/GridDhtDetachedCacheEntry.java | 10 ++-------- .../cache/distributed/near/GridNearCacheAdapter.java | 6 ++---- .../cache/distributed/near/GridNearCacheEntry.java | 8 ++------ .../cache/distributed/near/GridNearTxLocal.java | 7 +++---- .../processors/cache/local/GridLocalCache.java | 6 ++---- .../processors/cache/local/GridLocalCacheEntry.java | 8 ++------ .../ignite/loadtests/hashmap/GridHashMapLoadTest.java | 4 +--- 22 files changed, 51 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/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 d630a2b..ef8d854 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 @@ -946,7 +946,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V * @return Entry (never {@code null}). */ public GridCacheEntryEx entryEx(KeyCacheObject key, AffinityTopologyVersion topVer) { - GridCacheEntryEx e = map.putEntryIfObsoleteOrAbsent(topVer, key, null, true, false); + GridCacheEntryEx e = map.putEntryIfObsoleteOrAbsent(topVer, key, true, false); assert e != null; @@ -968,7 +968,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V cur = map.putEntryIfObsoleteOrAbsent( topVer, key, - null, create, touch); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index 9378f74..0fe5c9f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -38,7 +38,6 @@ public interface GridCacheConcurrentMap { /** * @param topVer Topology version. * @param key Key. - * @param val Value. * @param create Create flag. * @return Existing or new GridCacheMapEntry. Will return {@code null} if entry is obsolete or absent and create * flag is set to {@code false}. Will also return {@code null} if create flag is set to {@code true}, but entry @@ -47,7 +46,6 @@ public interface GridCacheConcurrentMap { @Nullable public GridCacheMapEntry putEntryIfObsoleteOrAbsent( AffinityTopologyVersion topVer, KeyCacheObject key, - @Nullable CacheObject val, boolean create, boolean touch); http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/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 76d961a..2c262df 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 @@ -107,7 +107,6 @@ public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentM /** {@inheritDoc} */ @Nullable @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(final AffinityTopologyVersion topVer, KeyCacheObject key, - @Nullable final CacheObject val, final boolean create, final boolean touch) { GridCacheMapEntry cur = null; @@ -135,7 +134,7 @@ public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentM reserved = true; } - created0 = factory.create(ctx, topVer, key, key.hashCode(), val); + created0 = factory.create(ctx, topVer, key); } cur = created = created0; @@ -158,7 +157,7 @@ public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentM reserved = true; } - created0 = factory.create(ctx, topVer, key, key.hashCode(), val); + created0 = factory.create(ctx, topVer, key); } cur = created = created0; http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/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 856ac993..112acf6 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 @@ -169,14 +169,10 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme /** * @param cctx Cache context. * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. */ protected GridCacheMapEntry( GridCacheContext<?, ?> cctx, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { if (log == null) log = U.logger(cctx.kernalContext(), logRef, GridCacheMapEntry.class); @@ -186,15 +182,9 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme assert key != null; this.key = key; - this.hash = hash; + this.hash = key.hashCode(); this.cctx = cctx; - val = cctx.kernalContext().cacheObjects().prepareForCache(val, cctx); - - synchronized (this) { - value(val); - } - ver = cctx.versions().next(); startVer = ver.order(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java index 4ee9385..d3e3921 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java @@ -27,15 +27,11 @@ public interface GridCacheMapEntryFactory { * @param ctx Cache registry. * @param topVer Topology version. * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. * @return New cache entry. */ public GridCacheMapEntry create( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java index 00827ee..14a8482 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java @@ -45,10 +45,12 @@ public class GridNoStorageCacheMap implements GridCacheConcurrentMap { } /** {@inheritDoc} */ - @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(AffinityTopologyVersion topVer, KeyCacheObject key, - @Nullable CacheObject val, boolean create, boolean touch) { + @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(AffinityTopologyVersion topVer, + KeyCacheObject key, + boolean create, + boolean touch) { if (create) - return new GridDhtCacheEntry(ctx, topVer, key, key.hashCode(), val); + return new GridDhtCacheEntry(ctx, topVer, key); else return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java index f518934..e7675b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java @@ -49,16 +49,12 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry { /** * @param ctx Cache context. * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. */ public GridDistributedCacheEntry( GridCacheContext ctx, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - super(ctx, key, hash, val); + super(ctx, key); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java index 357bf89..f021b65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java @@ -79,20 +79,22 @@ public class GridCachePartitionedConcurrentMap implements GridCacheConcurrentMap } /** {@inheritDoc} */ - @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(AffinityTopologyVersion topVer, KeyCacheObject key, - @Nullable CacheObject val, boolean create, boolean touch) { + @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(AffinityTopologyVersion topVer, + KeyCacheObject key, + boolean create, + boolean touch) { while (true) { GridDhtLocalPartition part = localPartition(key, topVer, create); if (part == null) return null; - GridCacheMapEntry res = part.putEntryIfObsoleteOrAbsent(topVer, key, val, create, touch); + GridCacheMapEntry res = part.putEntryIfObsoleteOrAbsent(topVer, key, create, touch); if (res != null || !create) return res; - // Otherwise parttion was concurrently evicted and should be re-created on next iteration. + // Otherwise partition was concurrently evicted and should be re-created on next iteration. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index 7e6ae81..121c734 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -246,11 +246,9 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap @Override public GridCacheMapEntry create( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - return new GridDhtCacheEntry(ctx, topVer, key, hash, val); + return new GridDhtCacheEntry(ctx, topVer, key); } }; } @@ -428,7 +426,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap * @return Cache entry. */ protected GridDistributedCacheEntry createEntry(KeyCacheObject key) { - return new GridDhtDetachedCacheEntry(ctx, key, key.hashCode(), null, null, 0); + return new GridDhtDetachedCacheEntry(ctx, key); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java index 4c22090..be7805f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java @@ -76,17 +76,13 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry { * @param ctx Cache context. * @param topVer Topology version at the time of creation (if negative, then latest topology is assumed). * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. */ public GridDhtCacheEntry( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - super(ctx, key, hash, val); + super(ctx, key); // Record this entry with partition. int p = cctx.affinity().partition(key); http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/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 6b4c2ad..d636959 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 @@ -899,7 +899,9 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements CacheDataRow row = it0.next(); GridCacheMapEntry cached = putEntryIfObsoleteOrAbsent(cctx.affinity().affinityTopologyVersion(), - row.key(), null, true, false); + row.key(), + true, + false); if (cached instanceof GridDhtCacheEntry && ((GridDhtCacheEntry)cached).clearInternal(clearVer, extras)) { if (rec) { http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 1d32edd..47572fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -197,11 +197,9 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { @Override public GridCacheMapEntry create( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - return new GridDhtAtomicCacheEntry(ctx, topVer, key, hash, val); + return new GridDhtAtomicCacheEntry(ctx, topVer, key); } }; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/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 3f014d5..d3aca1f 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 @@ -33,17 +33,13 @@ public class GridDhtAtomicCacheEntry extends GridDhtCacheEntry { * @param ctx Cache context. * @param topVer Topology version at the time of creation (if negative, then latest topology is assumed). * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. */ - public GridDhtAtomicCacheEntry( + GridDhtAtomicCacheEntry( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - super(ctx, topVer, key, hash, val); + super(ctx, topVer, key); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 4163376..96231f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -121,11 +121,9 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte @Override public GridCacheMapEntry create( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - return new GridDhtColocatedCacheEntry(ctx, topVer, key, hash, val); + return new GridDhtColocatedCacheEntry(ctx, topVer, key); } }; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/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 cc71e11..f2ff2d3 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 @@ -32,17 +32,13 @@ public class GridDhtColocatedCacheEntry extends GridDhtCacheEntry { * @param ctx Cache context. * @param topVer Topology version at the time of creation (if negative, then latest topology is assumed). * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. */ - public GridDhtColocatedCacheEntry( + GridDhtColocatedCacheEntry( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - super(ctx, topVer, key, hash, val); + super(ctx, topVer, key); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java index ac81b63..404265d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.colocated; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheContext; -import org.apache.ignite.internal.processors.cache.GridCacheMapEntry; import org.apache.ignite.internal.processors.cache.GridCacheOperation; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.database.CacheDataRow; @@ -36,14 +35,9 @@ public class GridDhtDetachedCacheEntry extends GridDistributedCacheEntry { /** * @param ctx Cache context. * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. - * @param next Next entry in the linked list. - * @param hdrId Header ID. */ - public GridDhtDetachedCacheEntry(GridCacheContext ctx, KeyCacheObject key, int hash, CacheObject val, - GridCacheMapEntry next, int hdrId) { - super(ctx, key, hash, val); + public GridDhtDetachedCacheEntry(GridCacheContext ctx, KeyCacheObject key) { + super(ctx, key); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index f4ba043..2976d6e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -95,11 +95,9 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda @Override public GridCacheMapEntry create( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - return new GridNearCacheEntry(ctx, key, hash, val); + return new GridNearCacheEntry(ctx, key); } }; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java index fa098df..b17d0b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java @@ -66,16 +66,12 @@ public class GridNearCacheEntry extends GridDistributedCacheEntry { /** * @param ctx Cache context. * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. */ public GridNearCacheEntry( GridCacheContext ctx, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - super(ctx, key, hash, val); + super(ctx, key); part = ctx.affinity().partition(key); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index f795ddc..9ad084e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -3878,17 +3878,16 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea /** * @param cctx Cache context. * @param key Key. - * @param val Value. * @param filter Filter. * @return {@code True} if filter passed. */ private boolean isAll(GridCacheContext cctx, KeyCacheObject key, - CacheObject val, + final CacheObject val0, CacheEntryPredicate[] filter) { - GridCacheEntryEx e = new GridDhtDetachedCacheEntry(cctx, key, 0, val, null, 0) { + GridCacheEntryEx e = new GridDhtDetachedCacheEntry(cctx, key) { @Nullable @Override public CacheObject peekVisibleValue() { - return rawGet(); + return val0; } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java index 9d202d4..c411c8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java @@ -87,11 +87,9 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> { @Override public GridCacheMapEntry create( GridCacheContext ctx, AffinityTopologyVersion topVer, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - return new GridLocalCacheEntry(ctx, key, hash, val); + return new GridLocalCacheEntry(ctx, key); } }; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java index 3e93917..421b32a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java @@ -38,16 +38,12 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { /** * @param ctx Cache registry. * @param key Cache key. - * @param hash Key hash value. - * @param val Entry value. */ GridLocalCacheEntry( GridCacheContext ctx, - KeyCacheObject key, - int hash, - CacheObject val + KeyCacheObject key ) { - super(ctx, key, hash, val); + super(ctx, key); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/8ff65316/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java index 5c12f84..7d4f90e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java @@ -79,10 +79,8 @@ public class GridHashMapLoadTest extends GridCommonAbstractTest { while (true) { Integer key = i++; - Integer val = i++; - map.put(key, new GridCacheMapEntry(ctx, ctx.toCacheKeyObject(key), - key.hashCode(), ctx.toCacheObject(val)) { + map.put(key, new GridCacheMapEntry(ctx, ctx.toCacheKeyObject(key)) { @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder,
