Repository: incubator-ignite Updated Branches: refs/heads/ignite-41 0542551db -> 956bac743
# ignite-41 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/956bac74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/956bac74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/956bac74 Branch: refs/heads/ignite-41 Commit: 956bac7434375c8111b97cc06ceb9f88d62c122e Parents: 0542551 Author: sboikov <[email protected]> Authored: Tue Dec 23 09:36:09 2014 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 23 09:36:09 2014 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 6 +++++- .../GridDistributedTxRemoteAdapter.java | 1 - .../dht/atomic/GridDhtAtomicCache.java | 8 +++----- .../atomic/GridNearAtomicUpdateResponse.java | 1 + .../dht/colocated/GridDhtColocatedCache.java | 1 - .../distributed/near/GridNearGetRequest.java | 2 +- .../cache/transactions/IgniteTxEntry.java | 1 + .../transactions/IgniteTxLocalAdapter.java | 20 +++++++++++++------- 8 files changed, 24 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/956bac74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 8bcd6a9..c0870c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -35,7 +35,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable /** */ private static final long serialVersionUID = 0L; - /** */ + /** Context. */ private GridCacheContext<K, V> ctx; /** Gateway. */ @@ -614,7 +614,9 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(ctx); + out.writeObject(delegate); + out.writeObject(prj); } @@ -622,7 +624,9 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable @SuppressWarnings({"unchecked"}) @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { ctx = (GridCacheContext<K, V>)in.readObject(); + delegate = (GridCacheProjectionEx<K, V>)in.readObject(); + prj = (GridCacheProjectionImpl<K, V>)in.readObject(); gate = ctx.gate(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/956bac74/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index 2e87441..4a93646 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -23,7 +23,6 @@ import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; -import javax.cache.expiry.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/956bac74/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 0b5d638..3d09222 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -107,9 +107,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { @Override protected void init() { map.setEntryFactory(new GridCacheMapEntryFactory<K, V>() { /** {@inheritDoc} */ - @Override - public GridCacheMapEntry<K, V> create(GridCacheContext<K, V> ctx, long topVer, K key, int hash, - V val, GridCacheMapEntry<K, V> next, long ttl, int hdrId) { + @Override public GridCacheMapEntry<K, V> create(GridCacheContext<K, V> ctx, long topVer, K key, int hash, + V val, GridCacheMapEntry<K, V> next, long ttl, int hdrId) { return new GridDhtAtomicCacheEntry<>(ctx, topVer, key, hash, val, next, ttl, hdrId); } }); @@ -198,8 +197,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } ctx.io().addDisconnectListener(new GridDisconnectListener() { - @Override - public void onNodeDisconnected(UUID nodeId) { + @Override public void onNodeDisconnected(UUID nodeId) { scheduleAtomicFutureRecheck(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/956bac74/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 0be44aa..721f752 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -215,6 +215,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i } /** + * @param keyIdx Key index. * @param ttl TTL for near cache update. * @param expireTime Expire time for near cache update. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/956bac74/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 9878768..dc97735 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -26,7 +26,6 @@ import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; -import javax.cache.expiry.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/956bac74/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java index b6765fb..f8dd654 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java @@ -71,7 +71,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements @GridDirectVersion(2) private int taskNameHash; - /** */ + /** TTL for read operation. */ private long accessTtl; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/956bac74/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEntry.java index 68e4b93..17b153d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEntry.java @@ -759,6 +759,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, * Unmarshalls entry. * * @param ctx Cache context. + * @param near Near flag. * @param clsLdr Class loader. * @throws IgniteCheckedException If un-marshalling failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/956bac74/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java index 27c1f44..84ef5b7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -788,7 +788,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> ExpiryPolicy expiry = txEntry.expiry(); if (expiry == null) - expiry = txEntry.context().expiry(); + expiry = cacheCtx.expiry(); if (expiry != null) { Duration duration = expiry.getExpiryForAccess(); @@ -998,12 +998,6 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> } } - protected IgniteCacheExpiryPolicy accessPolicy(GridCacheContext ctx, - IgniteTxKey key, - @Nullable ExpiryPolicy expiryPlc) { - return null; - } - /** * Checks if there is a cached or swapped value for * {@link #getAllAsync(GridCacheContext, Collection, GridCacheEntryEx, boolean, IgnitePredicate[])} method. @@ -1258,6 +1252,18 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> } /** + * @param ctx Cache context. + * @param key Key. + * @param expiryPlc Expiry policy. + * @return Expiry policy wrapper for entries accessed locally in optimistic transaction. + */ + protected IgniteCacheExpiryPolicy accessPolicy(GridCacheContext ctx, + IgniteTxKey key, + @Nullable ExpiryPolicy expiryPlc) { + return null; + } + + /** * Adds skipped key. * * @param skipped Skipped set (possibly {@code null}).
