ignite-630
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e62f6d07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e62f6d07 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e62f6d07 Branch: refs/heads/ignite-630 Commit: e62f6d079a960b60b7c1bd3ba15ad1a4bef12c62 Parents: 7daf90f Author: avinogradov <avinogra...@gridgain.com> Authored: Wed May 6 15:50:16 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed May 6 15:50:16 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 207 ++----------------- .../extras/GridCacheAttributesEntryExtras.java | 35 +--- .../GridCacheAttributesMvccEntryExtras.java | 33 +-- ...dCacheAttributesMvccObsoleteEntryExtras.java | 33 +-- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 33 +-- .../GridCacheAttributesMvccTtlEntryExtras.java | 33 +-- .../GridCacheAttributesObsoleteEntryExtras.java | 34 +-- ...idCacheAttributesObsoleteTtlEntryExtras.java | 34 +-- .../GridCacheAttributesTtlEntryExtras.java | 34 +-- .../cache/extras/GridCacheEntryExtras.java | 14 -- .../extras/GridCacheEntryExtrasAdapter.java | 8 - .../cache/extras/GridCacheMvccEntryExtras.java | 9 - .../GridCacheMvccObsoleteEntryExtras.java | 8 - .../GridCacheMvccObsoleteTtlEntryExtras.java | 9 - .../extras/GridCacheMvccTtlEntryExtras.java | 8 - .../extras/GridCacheObsoleteEntryExtras.java | 8 - .../extras/GridCacheObsoleteTtlEntryExtras.java | 9 - .../cache/extras/GridCacheTtlEntryExtras.java | 8 - 18 files changed, 45 insertions(+), 512 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/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 5c141e2..7e7e934 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 @@ -28,7 +28,6 @@ import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.processors.dr.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.offheap.unsafe.*; import org.apache.ignite.internal.util.tostring.*; @@ -40,7 +39,6 @@ import org.jetbrains.annotations.*; import javax.cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; -import java.io.*; import java.nio.*; import java.util.*; import java.util.concurrent.atomic.*; @@ -53,7 +51,7 @@ import static org.apache.ignite.internal.processors.dr.GridDrType.*; */ @SuppressWarnings({ "NonPrivateFieldAccessedInSynchronizedContext", "TooBroadScope", "FieldAccessedSynchronizedAndUnsynchronized"}) -public abstract class GridCacheMapEntry implements GridCacheEntryEx { +public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter implements GridCacheEntryEx { /** */ private static final byte IS_DELETED_MASK = 0x01; @@ -297,7 +295,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { vb = val.valueBytes(cctx.cacheObjectContext()); } - extrasSize = extrasSize(); + extrasSize = extrasSize(); } return SIZE_OVERHEAD + extrasSize + kb.length + (vb == null ? 1 : vb.length); @@ -564,7 +562,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { */ protected final void releaseSwap() throws IgniteCheckedException { if (cctx.isSwapOrOffheapEnabled()) { - synchronized (this){ + synchronized (this) { cctx.swap().remove(key()); } @@ -1000,7 +998,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { else if (interceptorVal != val0) val0 = cctx.unwrapTemporary(interceptorVal); - val = cctx.toCacheObject(val0); + val = cctx.toCacheObject(val0); } // Determine new ttl and expire time. @@ -1547,7 +1545,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { if (evtOld == null) evtOld = cctx.unwrapTemporary(old); - cctx.events().addEvent(partition(), key, cctx.localNodeId(), null, (GridCacheVersion) null, + cctx.events().addEvent(partition(), key, cctx.localNodeId(), null, (GridCacheVersion)null, EVT_CACHE_OBJECT_REMOVED, null, false, evtOld, evtOld != null || hadVal, subjId, null, taskName); } @@ -2575,7 +2573,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { // For optimistic checking. GridCacheVersion startVer; - synchronized (this){ + synchronized (this) { checkObsolete(); startVer = ver; @@ -2757,8 +2755,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { boolean swap, AffinityTopologyVersion topVer, @Nullable IgniteCacheExpiryPolicy expiryPlc) - throws GridCacheEntryRemovedException, IgniteCheckedException - { + throws GridCacheEntryRemovedException, IgniteCheckedException { assert heap || offheap || swap; try { @@ -2770,7 +2767,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { } if (offheap || swap) { - GridCacheSwapEntry e = cctx.swap().read(this, false, offheap, swap); + GridCacheSwapEntry e = cctx.swap().read(this, false, offheap, swap); return e != null ? e.value() : null; } @@ -2805,7 +2802,8 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { * @throws GridCacheEntryRemovedException If entry is obsolete. * @throws IgniteCheckedException If entry was externally locked. */ - private void groupLockSanityCheck(IgniteInternalTx tx) throws GridCacheEntryRemovedException, IgniteCheckedException { + private void groupLockSanityCheck(IgniteInternalTx tx) + throws GridCacheEntryRemovedException, IgniteCheckedException { assert tx.groupLock(); IgniteTxEntry txEntry = tx.entry(txKey()); @@ -3066,8 +3064,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { @Override public synchronized boolean versionedValue(CacheObject val, GridCacheVersion curVer, GridCacheVersion newVer) - throws IgniteCheckedException, GridCacheEntryRemovedException - { + throws IgniteCheckedException, GridCacheEntryRemovedException { checkObsolete(); if (curVer == null || curVer.equals(ver)) { @@ -3145,7 +3142,8 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { } /** {@inheritDoc} */ - @Override public synchronized boolean lockedLocally(GridCacheVersion lockVer) throws GridCacheEntryRemovedException { + @Override public synchronized boolean lockedLocally(GridCacheVersion lockVer) + throws GridCacheEntryRemovedException { checkObsolete(); GridCacheMvcc mvcc = mvccExtras(); @@ -3791,170 +3789,6 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { return tx == null || !tx.removed(txKey()); } - /** - * Ensures that internal data storage is created. - * - * @param size Amount of data to ensure. - * @return {@code true} if data storage was created. - */ - private boolean ensureData(int size) { - if (attributeDataExtras() == null) { - attributeDataExtras(new GridLeanMap<Integer, Object>(size)); - - return true; - } - else - return false; - } - - /** {@inheritDoc} */ - @SuppressWarnings({"unchecked"}) - @Nullable @Override public <V1> V1 addMeta(int key, V1 val) { - A.notNull(key, "key", val, "val"); - - synchronized (this) { - ensureData(1); - - return (V1)attributeDataExtras().put(key, val); - } - } - - /** {@inheritDoc} */ - @SuppressWarnings({"unchecked"}) - @Nullable @Override public <V1> V1 meta(int key) { - A.notNull(key, "key"); - - synchronized (this) { - GridLeanMap<Integer, Object> attrData = attributeDataExtras(); - - return attrData == null ? null : (V1)attrData.get(key); - } - } - - /** {@inheritDoc} */ - @SuppressWarnings({"unchecked"}) - @Nullable @Override public <V1> V1 removeMeta(int key) { - A.notNull(key, "key"); - - synchronized (this) { - GridLeanMap<Integer, Object> attrData = attributeDataExtras(); - - if (attrData == null) - return null; - - V1 old = (V1)attrData.remove(key); - - if (attrData.isEmpty()) - attributeDataExtras(null); - - return old; - } - } - - /** {@inheritDoc} */ - @SuppressWarnings({"unchecked"}) - @Override public <V1> boolean removeMeta(int key, V1 val) { - A.notNull(key, "key", val, "val"); - - synchronized (this) { - GridLeanMap<Integer, Object> attrData = attributeDataExtras(); - - if (attrData == null) - return false; - - V1 old = (V1)attrData.get(key); - - if (old != null && old.equals(val)) { - attrData.remove(key); - - if (attrData.isEmpty()) - attributeDataExtras(null); - - return true; - } - - return false; - } - } - - /** {@inheritDoc} */ - @Override public boolean hasMeta(int key) { - return meta(key) != null; - } - - /** {@inheritDoc} */ - @SuppressWarnings({"unchecked"}) - @Nullable @Override public <V1> V1 putMetaIfAbsent(int key, V1 val) { - A.notNull(key, "key", val, "val"); - - synchronized (this) { - V1 v = meta(key); - - if (v == null) - return addMeta(key, val); - - return v; - } - } - - /** {@inheritDoc} */ - @SuppressWarnings({"RedundantTypeArguments"}) - @Override public <V1> boolean replaceMeta(int key, V1 curVal, V1 newVal) { - A.notNull(key, "key", newVal, "newVal", curVal, "curVal"); - - synchronized (this) { - if (hasMeta(key)) { - V1 val = this.<V1>meta(key); - - if (val != null && val.equals(curVal)) { - addMeta(key, newVal); - - return true; - } - } - - return false; - } - } - - /** - * Convenience way for super-classes which implement {@link Externalizable} to - * serialize metadata. Super-classes must call this method explicitly from - * within {@link Externalizable#writeExternal(ObjectOutput)} methods implementation. - * - * @param out Output to write to. - * @throws IOException If I/O error occurred. - */ - @SuppressWarnings({"TooBroadScope"}) - protected void writeExternalMeta(ObjectOutput out) throws IOException { - Map<Integer, Object> cp; - - // Avoid code warning (suppressing is bad here, because we need this warning for other places). - synchronized (this) { - cp = new GridLeanMap<>(attributeDataExtras()); - } - - out.writeObject(cp); - } - - /** - * Convenience way for super-classes which implement {@link Externalizable} to - * serialize metadata. Super-classes must call this method explicitly from - * within {@link Externalizable#readExternal(ObjectInput)} methods implementation. - * - * @param in Input to read from. - * @throws IOException If I/O error occurred. - * @throws ClassNotFoundException If some class could not be found. - */ - @SuppressWarnings({"unchecked"}) - protected void readExternalMeta(ObjectInput in) throws IOException, ClassNotFoundException { - GridLeanMap<Integer, Object> cp = (GridLeanMap<Integer, Object>)in.readObject(); - - synchronized (this) { - attributeDataExtras(cp); - } - } - /** {@inheritDoc} */ @Override public boolean deleted() { if (!cctx.deferredDelete()) @@ -4008,21 +3842,6 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { } /** - * @return Attribute data. - */ - @Nullable private GridLeanMap<Integer, Object> attributeDataExtras() { - return extras != null ? extras.attributesData() : null; - } - - /** - * @param attrData Attribute data. - */ - private void attributeDataExtras(@Nullable GridLeanMap<Integer, Object> attrData) { - extras = (extras != null) ? extras.attributesData(attrData) : attrData != null ? - new GridCacheAttributesEntryExtras(attrData) : null; - } - - /** * @return MVCC. */ @Nullable protected GridCacheMvcc mvccExtras() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java index c4b87ca..911a1db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java @@ -19,59 +19,32 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; /** * Extras where attributes are set. */ public class GridCacheAttributesEntryExtras extends GridCacheEntryExtrasAdapter { - /** Attributes data. */ - private GridLeanMap<Integer, Object> attrData; - /** * Constructor. - * - * @param attrData Attributes data. */ - public GridCacheAttributesEntryExtras(GridLeanMap<Integer, Object> attrData) { - assert attrData != null; - - this.attrData = attrData; - } - - /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return attrData; - } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<Integer, Object> attrData) { - if (attrData != null) { - this.attrData = attrData; + public GridCacheAttributesEntryExtras() { - return this; - } - else - return null; } /** {@inheritDoc} */ @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { - return mvcc != null ? new GridCacheAttributesMvccEntryExtras(attrData, mvcc) : this; + return mvcc != null ? new GridCacheAttributesMvccEntryExtras(mvcc) : this; } /** {@inheritDoc} */ @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { - return obsoleteVer != null ? new GridCacheAttributesObsoleteEntryExtras(attrData, obsoleteVer) : this; + return obsoleteVer != null ? new GridCacheAttributesObsoleteEntryExtras(obsoleteVer) : this; } /** {@inheritDoc} */ @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { - return ttl != 0 ? new GridCacheAttributesTtlEntryExtras(attrData, ttl, expireTime) : this; + return ttl != 0 ? new GridCacheAttributesTtlEntryExtras(ttl, expireTime) : this; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java index f13e6a6..cb36999 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java @@ -19,53 +19,28 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; -import java.util.*; - /** * Extras where attributes and MVCC are set. */ public class GridCacheAttributesMvccEntryExtras extends GridCacheEntryExtrasAdapter { - /** Attributes data. */ - private GridLeanMap<Integer, Object> attrData; - /** MVCC. */ private GridCacheMvcc mvcc; /** * Constructor. * - * @param attrData Attributes data. * @param mvcc MVCC. */ - public GridCacheAttributesMvccEntryExtras(GridLeanMap<Integer, Object> attrData, GridCacheMvcc mvcc) { - assert attrData != null; + public GridCacheAttributesMvccEntryExtras(GridCacheMvcc mvcc) { assert mvcc != null; - this.attrData = attrData; this.mvcc = mvcc; } /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return attrData; - } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<Integer, Object> attrData) { - if (attrData != null) { - this.attrData = attrData; - - return this; - } - else - return new GridCacheMvccEntryExtras(mvcc); - } - - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return mvcc; } @@ -78,18 +53,18 @@ public class GridCacheAttributesMvccEntryExtras extends GridCacheEntryExtrasAdap return this; } else - return new GridCacheAttributesEntryExtras(attrData); + return new GridCacheAttributesEntryExtras(); } /** {@inheritDoc} */ @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { - return obsoleteVer != null ? new GridCacheAttributesMvccObsoleteEntryExtras(attrData, mvcc, obsoleteVer) : + return obsoleteVer != null ? new GridCacheAttributesMvccObsoleteEntryExtras(mvcc, obsoleteVer) : this; } /** {@inheritDoc} */ @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { - return ttl != 0 ? new GridCacheAttributesMvccTtlEntryExtras(attrData, mvcc, ttl, expireTime) : this; + return ttl != 0 ? new GridCacheAttributesMvccTtlEntryExtras(mvcc, ttl, expireTime) : this; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java index 4d12be9..a0b9b25 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java @@ -19,19 +19,13 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; -import java.util.*; - /** * Extras where attributes, MVCC and obsolete version are set. */ public class GridCacheAttributesMvccObsoleteEntryExtras extends GridCacheEntryExtrasAdapter { - /** Attributes data. */ - private GridLeanMap<Integer, Object> attrData; - /** MVCC. */ private GridCacheMvcc mvcc; @@ -41,38 +35,19 @@ public class GridCacheAttributesMvccObsoleteEntryExtras extends GridCacheEntryEx /** * Constructor. * - * @param attrData Attributes data. * @param mvcc MVCC. * @param obsoleteVer Obsolete version. */ - public GridCacheAttributesMvccObsoleteEntryExtras(GridLeanMap<Integer, Object> attrData, GridCacheMvcc mvcc, + public GridCacheAttributesMvccObsoleteEntryExtras(GridCacheMvcc mvcc, GridCacheVersion obsoleteVer) { - assert attrData != null; assert mvcc != null; assert obsoleteVer != null; - this.attrData = attrData; this.mvcc = mvcc; this.obsoleteVer = obsoleteVer; } /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return attrData; - } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<Integer, Object> attrData) { - if (attrData != null) { - this.attrData = attrData; - - return this; - } - else - return new GridCacheMvccObsoleteEntryExtras(mvcc, obsoleteVer); - } - - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return mvcc; } @@ -85,7 +60,7 @@ public class GridCacheAttributesMvccObsoleteEntryExtras extends GridCacheEntryEx return this; } else - return new GridCacheAttributesObsoleteEntryExtras(attrData, obsoleteVer); + return new GridCacheAttributesObsoleteEntryExtras(obsoleteVer); } /** {@inheritDoc} */ @@ -101,12 +76,12 @@ public class GridCacheAttributesMvccObsoleteEntryExtras extends GridCacheEntryEx return this; } else - return new GridCacheAttributesMvccEntryExtras(attrData, mvcc); + return new GridCacheAttributesMvccEntryExtras(mvcc); } /** {@inheritDoc} */ @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { - return ttl != 0 ? new GridCacheAttributesMvccObsoleteTtlEntryExtras(attrData, mvcc, obsoleteVer, ttl, + return ttl != 0 ? new GridCacheAttributesMvccObsoleteTtlEntryExtras(mvcc, obsoleteVer, ttl, expireTime) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java index 4adc29d..c7727c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java @@ -19,19 +19,13 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; -import java.util.*; - /** * Extras where attributes, MVCC, obsolete version and TTL are set. */ public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntryExtrasAdapter { - /** Attributes data. */ - private GridLeanMap<Integer, Object> attrData; - /** MVCC. */ private GridCacheMvcc mvcc; @@ -47,20 +41,17 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntr /** * Constructor. * - * @param attrData Attributes data. * @param mvcc MVCC. * @param obsoleteVer Obsolete version. * @param ttl TTL. * @param expireTime Expire time. */ - public GridCacheAttributesMvccObsoleteTtlEntryExtras(GridLeanMap<Integer, Object> attrData, GridCacheMvcc mvcc, + public GridCacheAttributesMvccObsoleteTtlEntryExtras(GridCacheMvcc mvcc, GridCacheVersion obsoleteVer, long ttl, long expireTime) { - assert attrData != null; assert mvcc != null; assert obsoleteVer != null; assert ttl != 0; - this.attrData = attrData; this.mvcc = mvcc; this.obsoleteVer = obsoleteVer; this.ttl = ttl; @@ -68,22 +59,6 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntr } /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return attrData; - } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<Integer, Object> attrData) { - if (attrData != null) { - this.attrData = attrData; - - return this; - } - else - return new GridCacheMvccObsoleteTtlEntryExtras(mvcc, obsoleteVer, ttl ,expireTime); - } - - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return mvcc; } @@ -96,7 +71,7 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntr return this; } else - return new GridCacheAttributesObsoleteTtlEntryExtras(attrData, obsoleteVer, ttl, expireTime); + return new GridCacheAttributesObsoleteTtlEntryExtras(obsoleteVer, ttl, expireTime); } /** {@inheritDoc} */ @@ -112,7 +87,7 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntr return this; } else - return new GridCacheAttributesMvccTtlEntryExtras(attrData, mvcc, ttl, expireTime); + return new GridCacheAttributesMvccTtlEntryExtras(mvcc, ttl, expireTime); } /** {@inheritDoc} */ @@ -134,7 +109,7 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntr return this; } else - return new GridCacheAttributesMvccObsoleteEntryExtras(attrData, mvcc, obsoleteVer); + return new GridCacheAttributesMvccObsoleteEntryExtras(mvcc, obsoleteVer); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java index 68dc3bf..aa5df67 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java @@ -19,19 +19,13 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; -import java.util.*; - /** * Extras where attributes, MVCC and TTL are set. */ public class GridCacheAttributesMvccTtlEntryExtras extends GridCacheEntryExtrasAdapter { - /** Attributes data. */ - private GridLeanMap<Integer, Object> attrData; - /** MVCC. */ private GridCacheMvcc mvcc; @@ -44,40 +38,21 @@ public class GridCacheAttributesMvccTtlEntryExtras extends GridCacheEntryExtrasA /** * Constructor. * - * @param attrData Attributes data. * @param mvcc MVCC. * @param ttl TTL. * @param expireTime Expire time. */ - public GridCacheAttributesMvccTtlEntryExtras(GridLeanMap<Integer, Object> attrData, GridCacheMvcc mvcc, long ttl, + public GridCacheAttributesMvccTtlEntryExtras(GridCacheMvcc mvcc, long ttl, long expireTime) { - assert attrData != null; assert mvcc != null; assert ttl != 0; - this.attrData = attrData; this.mvcc = mvcc; this.ttl = ttl; this.expireTime = expireTime; } /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return attrData; - } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<Integer, Object> attrData) { - if (attrData != null) { - this.attrData = attrData; - - return this; - } - else - return new GridCacheMvccTtlEntryExtras(mvcc, ttl ,expireTime); - } - - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return mvcc; } @@ -90,12 +65,12 @@ public class GridCacheAttributesMvccTtlEntryExtras extends GridCacheEntryExtrasA return this; } else - return new GridCacheAttributesTtlEntryExtras(attrData, ttl, expireTime); + return new GridCacheAttributesTtlEntryExtras(ttl, expireTime); } /** {@inheritDoc} */ @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { - return obsoleteVer != null ? new GridCacheAttributesMvccObsoleteTtlEntryExtras(attrData, mvcc, obsoleteVer, + return obsoleteVer != null ? new GridCacheAttributesMvccObsoleteTtlEntryExtras(mvcc, obsoleteVer, ttl, expireTime) : this; } @@ -118,7 +93,7 @@ public class GridCacheAttributesMvccTtlEntryExtras extends GridCacheEntryExtrasA return this; } else - return new GridCacheAttributesMvccEntryExtras(attrData, mvcc); + return new GridCacheAttributesMvccEntryExtras(mvcc); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java index c7451a0..47c46d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java @@ -19,55 +19,29 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; /** * Extras where attributes and obsolete version are set. */ public class GridCacheAttributesObsoleteEntryExtras extends GridCacheEntryExtrasAdapter { - /** Attributes data. */ - private GridLeanMap<Integer, Object> attrData; - /** Obsolete version. */ private GridCacheVersion obsoleteVer; /** * Constructor. * - * @param attrData Attributes data. * @param obsoleteVer Obsolete version. */ - public GridCacheAttributesObsoleteEntryExtras(GridLeanMap<Integer, Object> attrData, GridCacheVersion obsoleteVer) { - assert attrData != null; + public GridCacheAttributesObsoleteEntryExtras(GridCacheVersion obsoleteVer) { assert obsoleteVer != null; - this.attrData = attrData; this.obsoleteVer = obsoleteVer; } /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return attrData; - } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<Integer, Object> attrData) { - if (attrData != null) { - this.attrData = attrData; - - return this; - } - else - return new GridCacheObsoleteEntryExtras(obsoleteVer); - } - - /** {@inheritDoc} */ @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { - return mvcc != null ? new GridCacheAttributesMvccObsoleteEntryExtras(attrData, mvcc, obsoleteVer) : this; + return mvcc != null ? new GridCacheAttributesMvccObsoleteEntryExtras(mvcc, obsoleteVer) : this; } /** {@inheritDoc} */ @@ -83,12 +57,12 @@ public class GridCacheAttributesObsoleteEntryExtras extends GridCacheEntryExtras return this; } else - return new GridCacheAttributesEntryExtras(attrData); + return new GridCacheAttributesEntryExtras(); } /** {@inheritDoc} */ @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { - return ttl != 0 ? new GridCacheAttributesObsoleteTtlEntryExtras(attrData, obsoleteVer, ttl, expireTime) : + return ttl != 0 ? new GridCacheAttributesObsoleteTtlEntryExtras(obsoleteVer, ttl, expireTime) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java index 09cd41b..42cff5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java @@ -19,19 +19,12 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; /** * Extras where attributes, obsolete version and TTL are set. */ public class GridCacheAttributesObsoleteTtlEntryExtras extends GridCacheEntryExtrasAdapter { - /** Attributes data. */ - private GridLeanMap<Integer, Object> attrData; - /** Obsolete version. */ private GridCacheVersion obsoleteVer; @@ -44,42 +37,23 @@ public class GridCacheAttributesObsoleteTtlEntryExtras extends GridCacheEntryExt /** * Constructor. * - * @param attrData Attributes data. * @param obsoleteVer Obsolete version. * @param ttl TTL. * @param expireTime Expire time. */ - public GridCacheAttributesObsoleteTtlEntryExtras(GridLeanMap<Integer, Object> attrData, GridCacheVersion obsoleteVer, + public GridCacheAttributesObsoleteTtlEntryExtras(GridCacheVersion obsoleteVer, long ttl, long expireTime) { - assert attrData != null; assert obsoleteVer != null; assert ttl != 0; - this.attrData = attrData; this.obsoleteVer = obsoleteVer; this.ttl = ttl; this.expireTime = expireTime; } /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return attrData; - } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<Integer, Object> attrData) { - if (attrData != null) { - this.attrData = attrData; - - return this; - } - else - return new GridCacheObsoleteTtlEntryExtras(obsoleteVer, ttl, expireTime); - } - - /** {@inheritDoc} */ @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { - return mvcc != null ? new GridCacheAttributesMvccObsoleteTtlEntryExtras(attrData, mvcc, obsoleteVer, ttl, + return mvcc != null ? new GridCacheAttributesMvccObsoleteTtlEntryExtras(mvcc, obsoleteVer, ttl, expireTime) : this; } @@ -96,7 +70,7 @@ public class GridCacheAttributesObsoleteTtlEntryExtras extends GridCacheEntryExt return this; } else - return new GridCacheAttributesTtlEntryExtras(attrData, ttl, expireTime); + return new GridCacheAttributesTtlEntryExtras(ttl, expireTime); } /** {@inheritDoc} */ @@ -118,7 +92,7 @@ public class GridCacheAttributesObsoleteTtlEntryExtras extends GridCacheEntryExt return this; } else - return new GridCacheAttributesObsoleteEntryExtras(attrData, obsoleteVer); + return new GridCacheAttributesObsoleteEntryExtras(obsoleteVer); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java index b69f380..cf2dc45 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java @@ -19,19 +19,12 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; /** * Extras where attributes and TTL are set. */ public class GridCacheAttributesTtlEntryExtras extends GridCacheEntryExtrasAdapter { - /** Attributes data. */ - private GridLeanMap<Integer, Object> attrData; - /** TTL. */ private long ttl; @@ -41,43 +34,24 @@ public class GridCacheAttributesTtlEntryExtras extends GridCacheEntryExtrasAdapt /** * Constructor. * - * @param attrData Attributes data. * @param ttl TTL. * @param expireTime Expire time. */ - public GridCacheAttributesTtlEntryExtras(GridLeanMap<Integer, Object> attrData, long ttl, long expireTime) { - assert attrData != null; + public GridCacheAttributesTtlEntryExtras(long ttl, long expireTime) { assert ttl != 0; - this.attrData = attrData; this.ttl = ttl; this.expireTime = expireTime; } /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return attrData; - } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<Integer, Object> attrData) { - if (attrData != null) { - this.attrData = attrData; - - return this; - } - else - return new GridCacheTtlEntryExtras(ttl, expireTime); - } - - /** {@inheritDoc} */ @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { - return mvcc != null ? new GridCacheAttributesMvccTtlEntryExtras(attrData, mvcc, ttl, expireTime) : this; + return mvcc != null ? new GridCacheAttributesMvccTtlEntryExtras(mvcc, ttl, expireTime) : this; } /** {@inheritDoc} */ @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { - return obsoleteVer != null ? new GridCacheAttributesObsoleteTtlEntryExtras(attrData, obsoleteVer, ttl, + return obsoleteVer != null ? new GridCacheAttributesObsoleteTtlEntryExtras(obsoleteVer, ttl, expireTime) : this; } @@ -100,7 +74,7 @@ public class GridCacheAttributesTtlEntryExtras extends GridCacheEntryExtrasAdapt return this; } else - return new GridCacheAttributesEntryExtras(attrData); + return new GridCacheAttributesEntryExtras(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java index 5a2c00a..568555d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java @@ -19,27 +19,13 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.jetbrains.annotations.*; -import java.util.*; - /** * Cache extras. */ public interface GridCacheEntryExtras { /** - * @return Attributes data. - */ - @Nullable public GridLeanMap<Integer, Object> attributesData(); - - /** - * @param attrData Attributes data. - * @return Updated extras. - */ - public GridCacheEntryExtras attributesData(GridLeanMap<Integer, Object> attrData); - - /** * @return MVCC. */ @Nullable public GridCacheMvcc mvcc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java index 2eda1bb..058353e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java @@ -19,20 +19,12 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; - -import java.util.*; /** * Cache extras adapter. */ public abstract class GridCacheEntryExtrasAdapter implements GridCacheEntryExtras { /** {@inheritDoc} */ - @Override public GridLeanMap<Integer, Object> attributesData() { - return null; - } - - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java index a90f1fd..e1d5bc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java @@ -19,11 +19,8 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import java.util.*; - /** * Extras where MVCC is set. */ @@ -42,12 +39,6 @@ public class GridCacheMvccEntryExtras extends GridCacheEntryExtrasAdapter { this.mvcc = mvcc; } - - /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(GridLeanMap<Integer, Object> attrData) { - return attrData != null ? new GridCacheAttributesMvccEntryExtras(attrData, mvcc) : this; - } - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return mvcc; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java index c02f937..29b7b4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java @@ -19,11 +19,8 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import java.util.*; - /** * Extras where MVCC and obsolete version are set. */ @@ -49,11 +46,6 @@ public class GridCacheMvccObsoleteEntryExtras extends GridCacheEntryExtrasAdapte } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(GridLeanMap<Integer, Object> attrData) { - return attrData != null ? new GridCacheAttributesMvccObsoleteEntryExtras(attrData, mvcc, obsoleteVer) : this; - } - - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return mvcc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java index 51c5eda..9b56ebd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java @@ -19,11 +19,8 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import java.util.*; - /** * Extras where MVCC, obsolete version and TTL are set. */ @@ -61,12 +58,6 @@ public class GridCacheMvccObsoleteTtlEntryExtras extends GridCacheEntryExtrasAda } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(GridLeanMap<Integer, Object> attrData) { - return attrData != null ? new GridCacheAttributesMvccObsoleteTtlEntryExtras(attrData, mvcc, obsoleteVer, ttl, - expireTime) : this; - } - - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return mvcc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java index 58d9c78..d41c05c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java @@ -19,11 +19,8 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import java.util.*; - /** * Extras where MVCC and TTL are set. */ @@ -54,11 +51,6 @@ public class GridCacheMvccTtlEntryExtras extends GridCacheEntryExtrasAdapter { } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(GridLeanMap<Integer, Object> attrData) { - return attrData != null ? new GridCacheAttributesMvccTtlEntryExtras(attrData, mvcc, ttl, expireTime) : this; - } - - /** {@inheritDoc} */ @Override public GridCacheMvcc mvcc() { return mvcc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java index 1650f9f..fd1da38 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java @@ -19,11 +19,8 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import java.util.*; - /** * Extras where obsolete version is set. */ @@ -43,11 +40,6 @@ public class GridCacheObsoleteEntryExtras extends GridCacheEntryExtrasAdapter { } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(GridLeanMap<Integer, Object> attrData) { - return attrData != null ? new GridCacheAttributesObsoleteEntryExtras(attrData, obsoleteVer) : this; - } - - /** {@inheritDoc} */ @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { return mvcc != null ? new GridCacheMvccObsoleteEntryExtras(mvcc, obsoleteVer) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java index ab0358d..f4bb0b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java @@ -19,11 +19,8 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import java.util.*; - /** * Extras where obsolete version and TTL are set. */ @@ -54,12 +51,6 @@ public class GridCacheObsoleteTtlEntryExtras extends GridCacheEntryExtrasAdapter } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(GridLeanMap<Integer, Object> attrData) { - return attrData != null ? new GridCacheAttributesObsoleteTtlEntryExtras(attrData, obsoleteVer, ttl, - expireTime) : this; - } - - /** {@inheritDoc} */ @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { return mvcc != null ? new GridCacheMvccObsoleteTtlEntryExtras(mvcc, obsoleteVer, ttl, expireTime) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e62f6d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java index abd26f9..d334ede 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java @@ -19,11 +19,8 @@ package org.apache.ignite.internal.processors.cache.extras; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import java.util.*; - /** * Extras where TTL and expire time are set. */ @@ -48,11 +45,6 @@ public class GridCacheTtlEntryExtras extends GridCacheEntryExtrasAdapter { } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras attributesData(GridLeanMap<Integer, Object> attrData) { - return attrData != null ? new GridCacheAttributesTtlEntryExtras(attrData, ttl, expireTime) : this; - } - - /** {@inheritDoc} */ @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { return mvcc != null ? new GridCacheMvccTtlEntryExtras(mvcc, ttl, expireTime) : this; }
