# ignite-645
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ef095dc6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef095dc6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef095dc6 Branch: refs/heads/ignite-gg-9998 Commit: ef095dc64346ad8c9d3a641e8d1554bb18e97a11 Parents: 282e8a5 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 2 09:48:35 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 2 09:48:35 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheEntryEx.java | 13 ------- .../processors/cache/GridCacheMapEntry.java | 36 -------------------- .../processors/cache/GridCacheTestEntryEx.java | 9 ----- 3 files changed, 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef095dc6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java index c0f1d35..52b6a38 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java @@ -595,19 +595,6 @@ public interface GridCacheEntryEx { throws GridCacheEntryRemovedException, IgniteCheckedException; /** - * This method overwrites current in-memory value with new value. - * <p> - * Note that this method is non-transactional and non-distributed and should almost - * never be used. It is meant to be used when fixing some heurisitic error state. - * - * @param val Value to set. - * @return Previous value. - * @throws IgniteCheckedException If poke operation failed. - * @throws GridCacheEntryRemovedException if entry was unexpectedly removed. - */ - public CacheObject poke(CacheObject val) throws GridCacheEntryRemovedException, IgniteCheckedException; - - /** * Sets new value if current version is <tt>0</tt> * * @param val New value. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef095dc6/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 45fbced..11ee7d9 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 @@ -2800,42 +2800,6 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { return peek(heap, offheap, swap, topVer, plc); } - /** {@inheritDoc} */ - @Override public CacheObject poke(CacheObject val) throws GridCacheEntryRemovedException, IgniteCheckedException { - assert val != null; - - CacheObject old; - - synchronized (this) { - checkObsolete(); - - if (isNew() || !valid(AffinityTopologyVersion.NONE)) - unswap(true); - - if (deletedUnlocked()) - return null; - - old = rawGetOrUnmarshalUnlocked(false); - - GridCacheVersion nextVer = nextVersion(); - - // Update index inside synchronization since it can be updated - // in load methods without actually holding entry lock. - long expireTime = expireTimeExtras(); - - val = cctx.kernalContext().cacheObjects().prepareForCache(val, cctx); - - updateIndex(val, expireTime, nextVer, old); - - update(val, expireTime, ttlExtras(), nextVer); - } - - if (log.isDebugEnabled()) - log.debug("Poked cache entry [newVal=" + val + ", oldVal=" + old + ", entry=" + this + ']'); - - return old; - } - /** * Checks that entries in group locks transactions are not locked during commit. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef095dc6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index 9bdde1b..a21fea5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -606,15 +606,6 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return ver; } - /** {@inheritDoc} */ - @Override public CacheObject poke(CacheObject val) throws GridCacheEntryRemovedException, IgniteCheckedException { - CacheObject old = this.val; - - this.val = val; - - return old; - } - /** @inheritDoc */ @Override public boolean initialValue( CacheObject val,
