Repository: incubator-ignite Updated Branches: refs/heads/ignite-683 [created] 2dc16b2f3
#ignite-683: remove ttl from methods. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8b385619 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8b385619 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8b385619 Branch: refs/heads/ignite-683 Commit: 8b3856195e507dac4d0b00fbca8c133780939829 Parents: af5c9d3 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 6 19:46:49 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 6 19:46:49 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 49 +++++++++----------- .../processors/cache/GridCacheProjectionEx.java | 12 ++--- .../cache/GridCacheProjectionImpl.java | 20 ++++---- .../processors/cache/GridCacheProxyImpl.java | 15 +++--- .../dht/atomic/GridDhtAtomicCache.java | 12 ++--- .../distributed/near/GridNearAtomicCache.java | 12 ++--- .../local/atomic/GridLocalAtomicCache.java | 4 -- .../transactions/IgniteTxLocalAdapter.java | 1 - .../cache/transactions/IgniteTxLocalEx.java | 2 - 9 files changed, 54 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index b35dbd3..cfc5ec3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -2018,14 +2018,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public V put(K key, V val, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return put(key, val, null, -1, filter); + return put(key, val, null, filter); } /** {@inheritDoc} */ @Nullable @Override public V put(final K key, final V val, @Nullable final GridCacheEntryEx cached, - final long ttl, @Nullable final CacheEntryPredicate[] filter) throws IgniteCheckedException { @@ -2042,7 +2041,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, V prevVal = syncOp(new SyncOp<V>(true) { @Override public V op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - return (V)tx.putAllAsync(ctx, F.t(key, val), true, cached, ttl, filter).get().value(); + return (V)tx.putAllAsync(ctx, F.t(key, val), true, cached, filter).get().value(); } @Override public String toString() { @@ -2058,7 +2057,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public boolean putx(final K key, final V val, @Nullable final GridCacheEntryEx cached, - final long ttl, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { + @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2068,7 +2067,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return syncOp(new SyncOp<Boolean>(true) { @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - return tx.putAllAsync(ctx, F.t(key, val), false, cached, ttl, filter).get().success(); + return tx.putAllAsync(ctx, F.t(key, val), false, cached, filter).get().success(); } @Override public String toString() { @@ -2084,7 +2083,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final long start = statsEnabled ? System.nanoTime() : 0L; - IgniteInternalFuture<V> fut = putAsync(key, val, null, -1, filter); + IgniteInternalFuture<V> fut = putAsync(key, val, null, filter); if (statsEnabled) fut.listen(new UpdatePutAndGetTimeStatClosure<V>(metrics0(), start)); @@ -2094,7 +2093,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx entry, - final long ttl, @Nullable final CacheEntryPredicate... filter) { + @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2104,7 +2103,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return asyncOp(new AsyncOp<V>(key) { @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) { - return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl, filter) + return tx.putAllAsync(ctx, F.t(key, val), true, entry, filter) .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn>, V>)RET2VAL); } @@ -2130,7 +2129,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, Boolean stored = syncOp(new SyncOp<Boolean>(true) { @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, filter).get().success(); + return tx.putAllAsync(ctx, F.t(key, val), false, null, filter).get().success(); } @Override public String toString() { @@ -2388,7 +2387,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final long start = statsEnabled ? System.nanoTime() : 0L; - IgniteInternalFuture<Boolean> fut = putxAsync(key, val, null, -1, filter); + IgniteInternalFuture<Boolean> fut = putxAsync(key, val, null, filter); if (statsEnabled) fut.listen(new UpdatePutTimeStatClosure<Boolean>(metrics0(), start)); @@ -2398,7 +2397,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxAsync(final K key, final V val, - @Nullable final GridCacheEntryEx entry, final long ttl, + @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); @@ -2409,7 +2408,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return asyncOp(new AsyncOp<Boolean>(key) { @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter tx) { - return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl, filter).chain( + return tx.putAllAsync(ctx, F.t(key, val), false, entry, filter).chain( (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>) RET2FLAG); } @@ -2444,7 +2443,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return syncOp(new SyncOp<V>(true) { @Override public V op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - return (V)tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.noValArray()).get().value(); + return (V)tx.putAllAsync(ctx, F.t(key, val), true, null, ctx.noValArray()).get().value(); } @Override public String toString() { @@ -2468,7 +2467,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteInternalFuture<V> fut = asyncOp(new AsyncOp<V>(key) { @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) { - return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.noValArray()) + return tx.putAllAsync(ctx, F.t(key, val), true, null, ctx.noValArray()) .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn>, V>) RET2VAL); } @@ -2498,7 +2497,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, Boolean stored = syncOp(new SyncOp<Boolean>(true) { @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.noValArray()).get().success(); + return tx.putAllAsync(ctx, F.t(key, val), false, null, ctx.noValArray()).get().success(); } @Override public String toString() { @@ -2527,7 +2526,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) { @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter tx) { - return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.noValArray()).chain( + return tx.putAllAsync(ctx, F.t(key, val), false, null, ctx.noValArray()).chain( (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>)RET2FLAG); } @@ -2553,7 +2552,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return syncOp(new SyncOp<V>(true) { @Override public V op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - return (V)tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.hasValArray()).get().value(); + return (V)tx.putAllAsync(ctx, F.t(key, val), true, null, ctx.hasValArray()).get().value(); } @Override public String toString() { @@ -2577,7 +2576,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteInternalFuture<V> fut = asyncOp(new AsyncOp<V>(key) { @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) { - return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.hasValArray()).chain( + return tx.putAllAsync(ctx, F.t(key, val), true, null, ctx.hasValArray()).chain( (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, V>)RET2VAL); } @@ -2603,7 +2602,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return syncOp(new SyncOp<Boolean>(true) { @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.hasValArray()).get().success(); + return tx.putAllAsync(ctx, F.t(key, val), false, null, ctx.hasValArray()).get().success(); } @Override public String toString() { @@ -2623,7 +2622,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return asyncOp(new AsyncOp<Boolean>(key) { @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter tx) { - return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.hasValArray()).chain( + return tx.putAllAsync(ctx, F.t(key, val), false, null, ctx.hasValArray()).chain( (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>) RET2FLAG); } @@ -2650,7 +2649,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, if (ctx.deploymentEnabled()) ctx.deploy().registerClass(oldVal); - return tx.putAllAsync(ctx, F.t(key, newVal), false, null, -1, ctx.equalsValArray(oldVal)).get() + return tx.putAllAsync(ctx, F.t(key, newVal), false, null, ctx.equalsValArray(oldVal)).get() .success(); } @@ -2687,7 +2686,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } } - return tx.putAllAsync(ctx, F.t(key, newVal), false, null, -1, ctx.equalsValArray(oldVal)).chain( + return tx.putAllAsync(ctx, F.t(key, newVal), false, null, ctx.equalsValArray(oldVal)).chain( (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>)RET2FLAG); } @@ -2719,7 +2718,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, syncOp(new SyncInOp(m.size() == 1) { @Override public void inOp(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - tx.putAllAsync(ctx, m, false, null, -1, filter).get(); + tx.putAllAsync(ctx, m, false, null, filter).get(); } @Override public String toString() { @@ -2744,7 +2743,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return asyncOp(new AsyncInOp(m.keySet()) { @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter tx) { - return tx.putAllAsync(ctx, m, false, null, -1, filter).chain(RET2NULL); + return tx.putAllAsync(ctx, m, false, null, filter).chain(RET2NULL); } @Override public String toString() { @@ -3056,7 +3055,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, F.t(key, newVal), true, null, - -1, ctx.equalsValArray(oldVal)).get(); } @@ -3124,7 +3122,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, F.t(key, newVal), true, null, - -1, ctx.equalsValArray(oldVal)); return fut; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java index ec67976..3d0127c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java @@ -48,12 +48,11 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param key Key. * @param val Value. * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param ttl Optional time-to-live. If negative, leaves ttl value unchanged. * @param filter Optional filter. * @return Previous value. * @throws IgniteCheckedException If failed. */ - @Nullable public V put(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Nullable public V put(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; /** @@ -62,11 +61,10 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param key Key. * @param val Value. * @param entry Optional cached entry. - * @param ttl Optional time-to-live value. If negative, leaves ttl value unchanged. * @param filter Optional filter. * @return Put operation future. */ - public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter); /** @@ -75,12 +73,11 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param key Key. * @param val Value. * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param ttl Optional time-to-live. If negative, leaves ttl value unchanged. * @param filter Optional filter. * @return Previous value. * @throws IgniteCheckedException If failed. */ - public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; /** @@ -89,11 +86,10 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param key Key. * @param val Value. * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param ttl Optional time-to-live. If negative, leave ttl value unchanged. * @param filter Optional filter. * @return Putx operation future. */ - public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter); /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 9730c39..d067433 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -355,29 +355,29 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Override public V put(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return cache.put(key, val, entry, ttl, filter); + return cache.put(key, val, entry, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable CacheEntryPredicate[] filter) { - return putAsync(key, val, null, -1, filter); + return putAsync(key, val, null, filter); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate[] filter) { A.notNull(key, "key", val, "val"); - return cache.putAsync(key, val, entry, ttl, filter); + return cache.putAsync(key, val, entry, filter); } /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return cache.putx(key, val, entry, ttl, filter); + return cache.putx(key, val, entry, filter); } /** {@inheritDoc} */ @@ -441,15 +441,15 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable CacheEntryPredicate[] filter) { - return putxAsync(key, val, null, -1, filter); + return putxAsync(key, val, null, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate[] filter) { + @Nullable CacheEntryPredicate[] filter) { A.notNull(key, "key", val, "val"); - return cache.putxAsync(key, val, entry, ttl, filter); + return cache.putxAsync(key, val, entry, filter); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index 2e8449e..0561221 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -591,12 +591,12 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Override public V put(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.put(key, val, entry, ttl, filter); + return delegate.put(key, val, entry, filter); } finally { gate.leave(prev); @@ -617,12 +617,12 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.putAsync(key, val, entry, ttl, filter); + return delegate.putAsync(key, val, entry, filter); } finally { gate.leave(prev); @@ -630,12 +630,12 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.putx(key, val, entry, ttl, filter); + return delegate.putx(key, val, entry, filter); } finally { gate.leave(prev); @@ -782,12 +782,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.putxAsync(key, val, entry, ttl, filter); + return delegate.putxAsync(key, val, entry, filter); } finally { gate.leave(prev); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index be9a963..52dd71f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -301,15 +301,15 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable GridCacheEntryEx cached, long ttl, + @Override public V put(K key, V val, @Nullable GridCacheEntryEx cached, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { - return putAsync(key, val, cached, ttl, filter).get(); + return putAsync(key, val, cached, filter).get(); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx cached, - long ttl, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return putxAsync(key, val, cached, ttl, filter).get(); + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + return putxAsync(key, val, cached, filter).get(); } /** {@inheritDoc} */ @@ -321,7 +321,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate... filter) { + @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key"); return updateAllAsync0(F0.asMap(key, val), @@ -337,7 +337,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/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 6069849..f3b7eb7 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 @@ -392,19 +392,17 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { K key, V val, @Nullable GridCacheEntryEx cached, - long ttl, @Nullable CacheEntryPredicate[] filter ) throws IgniteCheckedException { - return dht.put(key, val, cached, ttl, filter); + return dht.put(key, val, cached, filter); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx cached, - long ttl, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return dht.putx(key, val, cached, ttl, filter); + return dht.putx(key, val, cached, filter); } /** {@inheritDoc} */ @@ -419,9 +417,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate... filter) { - return dht.putAsync(key, val, entry, ttl, filter); + return dht.putAsync(key, val, entry, filter); } /** {@inheritDoc} */ @@ -429,9 +426,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate... filter) { - return dht.putxAsync(key, val, entry, ttl, filter); + return dht.putxAsync(key, val, entry, filter); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 204baf0..525dc42 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -103,7 +103,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Override public V put(K key, V val, @Nullable GridCacheEntryEx cached, - long ttl, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); @@ -123,7 +122,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx cached, - long ttl, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); @@ -160,7 +158,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); @@ -177,7 +174,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 2cbf0c8..ab026c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -1879,7 +1879,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter Map<? extends K, ? extends V> map, boolean retval, @Nullable GridCacheEntryEx cached, - long ttl, CacheEntryPredicate[] filter ) { return (IgniteInternalFuture<GridCacheReturn>)putAllAsync0(cacheCtx, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b385619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java index 9f1a70e..6086913 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java @@ -86,7 +86,6 @@ public interface IgniteTxLocalEx extends IgniteInternalTx { * @param retval Flag indicating whether a value should be returned. * @param cached Cached entry, if any. Will be provided only if map has size 1. * @param filter Filter. - * @param ttl Time to live for entry. If negative, leave unchanged. * @return Future for put operation. */ public <K, V> IgniteInternalFuture<GridCacheReturn> putAllAsync( @@ -94,7 +93,6 @@ public interface IgniteTxLocalEx extends IgniteInternalTx { Map<? extends K, ? extends V> map, boolean retval, @Nullable GridCacheEntryEx cached, - long ttl, CacheEntryPredicate[] filter); /**
