# Refactoring: removed GridCacheMapEntry.toExpireTime() as it duplictes logic of the same method in GridCacheUtils.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1cff8b12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1cff8b12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1cff8b12 Branch: refs/heads/ignite-281 Commit: 1cff8b1252f7c2b9006cc8360a9e3498061f82c0 Parents: 1944ae3 Author: vozerov <voze...@gridgain.com> Authored: Thu Feb 19 15:39:15 2015 +0300 Committer: vozerov <voze...@gridgain.com> Committed: Thu Feb 19 15:39:15 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 34 ++++++-------------- .../distributed/near/GridNearAtomicCache.java | 4 +-- 2 files changed, 12 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cff8b12/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 578b095..e644442 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 @@ -164,7 +164,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> this.hash = hash; this.cctx = cctx; - ttlAndExpireTimeExtras(ttl, toExpireTime(ttl)); + ttlAndExpireTimeExtras(ttl, CU.toExpireTime(ttl)); if (cctx.portableEnabled()) val = (V)cctx.kernalContext().portable().detachPortable(val); @@ -854,7 +854,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> V prevVal = rawGetOrUnmarshalUnlocked(false); - long expTime = toExpireTime(ttl); + long expTime = CU.toExpireTime(ttl); if (loadedFromStore) // Update indexes before actual write to entry. @@ -928,7 +928,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> V old = rawGetOrUnmarshalUnlocked(false); - long expTime = toExpireTime(ttl); + long expTime = CU.toExpireTime(ttl); // Detach value before index update. if (cctx.portableEnabled()) @@ -1058,7 +1058,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> expireTime = expireTimeExtras(); } else - expireTime = toExpireTime(ttl); + expireTime = CU.toExpireTime(ttl); } assert ttl >= 0 : ttl; @@ -1454,7 +1454,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> expireTime = expireTimeExtras(); } else - expireTime = toExpireTime(ttl); + expireTime = CU.toExpireTime(ttl); } else { ttl = ttlExtras(); @@ -1932,7 +1932,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> } else { ttl0 = newTtl; - newExpireTime = toExpireTime(ttl0); + newExpireTime = CU.toExpireTime(ttl0); } } } @@ -2548,7 +2548,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> expireTime = CU.expireTimeInPast(); } else - expireTime = toExpireTime(ttl); + expireTime = CU.toExpireTime(ttl); long oldExpireTime = expireTimeExtras(); @@ -2576,20 +2576,6 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> } /** - * @param ttl Time to live. - * @return Expiration time. - */ - public static long toExpireTime(long ttl) { - long expireTime = ttl == 0 ? 0 : U.currentTimeMillis() + ttl; - - // Account for overflow. - if (expireTime < 0) - expireTime = 0; - - return expireTime; - } - - /** * @throws GridCacheEntryRemovedException If entry is obsolete. */ protected void checkObsolete() throws GridCacheEntryRemovedException { @@ -3085,7 +3071,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> @Override public synchronized V rawPut(V val, long ttl) { V old = this.val; - update(val, null, toExpireTime(ttl), ttl, nextVersion()); + update(val, null, CU.toExpireTime(ttl), ttl, nextVersion()); return old; } @@ -3109,7 +3095,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> checkObsolete(); if (isNew() || (!preload && deletedUnlocked())) { - long expTime = expireTime < 0 ? toExpireTime(ttl) : expireTime; + long expTime = expireTime < 0 ? CU.toExpireTime(ttl) : expireTime; if (cctx.portableEnabled()) val = (V)cctx.kernalContext().portable().detachPortable(val); @@ -3203,7 +3189,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> long ttl = ttlExtras(); - long expTime = toExpireTime(ttl); + long expTime = CU.toExpireTime(ttl); // Detach value before index update. if (cctx.portableEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cff8b12/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index 2b608f4..7fb962c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -164,7 +164,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { long expireTime = res.nearExpireTime(i); if (ttl != CU.TTL_NOT_CHANGED && expireTime == CU.EXPIRE_TIME_CALCULATE) - expireTime = GridCacheMapEntry.toExpireTime(ttl); + expireTime = CU.toExpireTime(ttl); try { processNearAtomicUpdateResponse(ver, @@ -318,7 +318,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { long expireTime = req.nearExpireTime(i); if (ttl != -1L && expireTime == -1L) - expireTime = GridCacheMapEntry.toExpireTime(ttl); + expireTime = CU.toExpireTime(ttl); GridCacheUpdateAtomicResult<K, V> updRes = entry.innerUpdate( ver,
