Remove updateTime
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea61e629 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea61e629 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea61e629 Branch: refs/heads/ignite-4587 Commit: ea61e6299589bdbff8a67542f95df66742cab8fe Parents: 6265f33 Author: Max Kozlov <[email protected]> Authored: Thu Mar 16 12:59:51 2017 +0300 Committer: Max Kozlov <[email protected]> Committed: Thu Mar 16 12:59:51 2017 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/cache/CacheEntry.java | 11 ----------- .../internal/processors/cache/CacheEntryImplEx.java | 8 +------- .../cache/version/CacheVersionedEntryAbstractTest.java | 2 -- 3 files changed, 1 insertion(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ea61e629/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java index 19585a3..90f30a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java @@ -82,15 +82,4 @@ public interface CacheEntry<K, V> extends Cache.Entry<K, V> { * @return Version of this cache entry. */ public Comparable version(); - - /** - * Returns the time when the cache entry for the given key has been updated or initially created. - * <p> - * It is valid to compare cache entries' update time for the same key. In this case the latter update will - * be represented by higher update time. The result of update time comparison of cache entries of different keys is - * undefined. - * - * @return Time in milliseconds. - */ - public long updateTime(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/ea61e629/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java index af926c6..664b216 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java @@ -70,11 +70,6 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach } /** {@inheritDoc} */ - @Override public long updateTime() { - return ver.globalTime(); - } - - /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); @@ -96,8 +91,7 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach if (ver != null && ver != GET_ENTRY_INVALID_VER_AFTER_GET && ver != GET_ENTRY_INVALID_VER_UPDATED) { res += ", topVer=" + ver.topologyVersion() + ", nodeOrder=" + ver.nodeOrder() + - ", order=" + ver.order() + - ", updateTime=" + ver.globalTime(); + ", order=" + ver.order(); } else res += ", ver=n/a"; http://git-wip-us.apache.org/repos/asf/ignite/blob/ea61e629/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java index 37cf26d..d1c0f31 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java @@ -155,7 +155,6 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS }); assert ver1.version().compareTo(ver2.version()) < 0; - assert ver1.updateTime() <= ver2.updateTime(); } /** @@ -165,7 +164,6 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS assertNotNull(entry); assertNotNull(entry.version()); - assert entry.updateTime() > 0; assertNotNull(entry.getKey()); assertNotNull(entry.getValue());
