http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index d74546c..a001c92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; @@ -33,6 +32,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/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 5eec9f0..dee9304 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 @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; import org.apache.ignite.*; -import org.apache.ignite.cache.Entry; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; @@ -44,6 +44,7 @@ import org.jdk8.backport.*; import org.jetbrains.annotations.*; import sun.misc.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.io.*; @@ -233,11 +234,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public Entry<K, V> entry(K key) { - return new GridDhtCacheEntryImpl<>(ctx.projectionPerCall(), ctx, key, null); - } - - /** {@inheritDoc} */ @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException { GridTuple<V> val = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java index 9ff7c5c..78bb604 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java @@ -17,15 +17,10 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; -import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.util.typedef.internal.*; -import javax.cache.Cache.*; - /** * DHT atomic cache entry. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index b13075e..926dc0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -36,6 +36,7 @@ import org.apache.ignite.lang.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index 3d0eb1e..b27b458 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -30,6 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 5fdac2e..9d37fc0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.colocated; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; @@ -36,11 +35,12 @@ import org.apache.ignite.plugin.security.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; -import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; import static org.apache.ignite.internal.processors.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; /** * Colocated cache. @@ -374,7 +374,8 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte * * {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> lockAllAsync(Collection<? extends K> keys, + @Override public IgniteInternalFuture<Boolean> lockAllAsync( + Collection<? extends K> keys, long timeout, @Nullable IgniteTxLocalEx<K, V> tx, boolean isInvalidate, @@ -382,7 +383,8 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte boolean retval, @Nullable IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<Entry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter + ) { assert tx == null || tx instanceof GridNearTxLocal; GridNearTxLocal<K, V> txx = (GridNearTxLocal<K, V>)tx; @@ -410,11 +412,6 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte } /** {@inheritDoc} */ - @Override public Entry<K, V> entry(K key) throws GridDhtInvalidPartitionException { - return new GridDhtCacheEntryImpl<>(ctx.projectionPerCall(), ctx, key, null); - } - - /** {@inheritDoc} */ @Override public void unlockAll(Collection<? extends K> keys, IgnitePredicate<Entry<K, V>>[] filter) { if (keys.isEmpty()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java index 25bb8bc..ceed6bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java @@ -17,9 +17,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.colocated; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 6c06f7a..6e7eaf5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.colocated; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; @@ -40,6 +39,7 @@ import org.apache.ignite.transactions.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/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 66b6a51..9cd336d 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 @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; @@ -35,6 +34,7 @@ import org.apache.ignite.plugin.security.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.processor.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 54f2dee..542db33 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; @@ -32,12 +31,13 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import java.io.*; import java.util.*; -import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; import static org.apache.ignite.internal.processors.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 64cf938..cff1879 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; @@ -35,6 +34,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index 00d7e90..f6e83d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; @@ -28,6 +27,7 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; +import javax.cache.Cache.*; import java.io.*; import java.nio.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java index 13ac0f1..abca1f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; @@ -39,6 +38,7 @@ import org.apache.ignite.transactions.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index 787d68c..ae838fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; @@ -31,6 +30,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.nio.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 15baff3..a76d444 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; @@ -35,6 +34,7 @@ import org.apache.ignite.plugin.security.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; @@ -409,7 +409,8 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> } /** {@inheritDoc} */ - @Override protected IgniteInternalFuture<Boolean> lockAllAsync(Collection<? extends K> keys, + @Override protected IgniteInternalFuture<Boolean> lockAllAsync( + Collection<? extends K> keys, long timeout, IgniteTxLocalEx<K, V> tx, boolean isInvalidate, @@ -417,7 +418,8 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> boolean retval, IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<Entry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter + ) { GridNearLockFuture<K, V> fut = new GridNearLockFuture<>(ctx, keys, (GridNearTxLocal<K, V>)tx, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java index 8d8074c..a8ca0c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.transactions.*; @@ -29,6 +28,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java index fd0918b..330c3cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.transactions.*; @@ -30,6 +29,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/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 ce1b949..d87f63d 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 @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.local.atomic; import org.apache.ignite.*; -import org.apache.ignite.cache.Entry; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.local.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java index 7615707..d65f774 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.query; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java index f5f90a4..a50386a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.query; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.lang.*; @@ -26,6 +25,7 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java index a2646a9..e925845 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.query; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; @@ -27,6 +26,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.spi.indexing.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java index ce5efad..88dd623 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java @@ -29,6 +29,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.plugin.security.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.util.*; import static org.apache.ignite.cache.CacheDistributionMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java index 0035fa6..721d28c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.processors.cache.query; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.util.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index fb5bc8b..38e6ae4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -2566,26 +2566,6 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Nullable @Override public V peek() { - return e.value(); - } - - /** {@inheritDoc} */ - @Override public Object version() { - return e.version(); - } - - /** {@inheritDoc} */ - @Override public long expirationTime() { - return e.expireTime(); - } - - /** {@inheritDoc} */ - @Override public long timeToLive() { - return e.timeToLive(); - } - - /** {@inheritDoc} */ @Nullable @Override public V getValue() { return e.value(); } @@ -2596,249 +2576,6 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Override public CacheProjection<K, V> projection() { - return null; - } - - /** {@inheritDoc} */ - @Nullable @Override public V peek(@Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException { - return null; - } - - /** {@inheritDoc} */ - @Nullable @Override public V reload() { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> reloadAsync() { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean isLocked() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean isLockedByThread() { - return false; - } - - /** {@inheritDoc} */ - @Override public void timeToLive(long ttl) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean primary() { - return cctx.affinity(). - primary(cctx.localNode(), getKey(), cctx.affinity().affinityTopologyVersion()); - } - - /** {@inheritDoc} */ - @Override public boolean backup() { - return cctx.affinity(). - backups(getKey(), cctx.affinity().affinityTopologyVersion()).contains(cctx.localNode()); - } - - /** {@inheritDoc} */ - @Override public int partition() { - return cctx.affinity().partition(getKey()); - } - - /** {@inheritDoc} */ - @Nullable @Override public V get() { - return getValue(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> getAsync() { - return new GridFinishedFuture<V>(cctx.kernalContext(), getValue()); - } - - /** {@inheritDoc} */ - @Nullable @Override public V setValue(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Nullable @Override public V set(V val, IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> setAsync(V val, IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Nullable @Override public V setIfAbsent(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> setIfAbsentAsync(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean setx(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> setxAsync(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean setxIfAbsent(@Nullable V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> setxIfAbsentAsync(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Nullable @Override public V replace(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> replaceAsync(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean replacex(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> replacexAsync(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean replace(V oldVal, V newVal) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> replaceAsync(V oldVal, V newVal) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Nullable @Override public V remove(@Nullable IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean removex(IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(@Nullable IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean remove(V val) throws IgniteCheckedException { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removeAsync(V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean evict() { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean clear() { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean compact() { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean lock(long timeout, @Nullable IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<Entry<K, V>>... filter) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public boolean isCached() { - return true; - } - - /** {@inheritDoc} */ - @Override public int memorySize() { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Nullable @Override public <V> V addMeta(String name, V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Nullable @Override public <V> V putMetaIfAbsent(String name, V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Nullable @Override public <V> V putMetaIfAbsent(String name, Callable<V> c) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public <V> V meta(String name) { - return null; - } - - /** {@inheritDoc} */ - @Override public <V> V removeMeta(String name) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public <V> boolean removeMeta(String name, V val) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Override public <V> boolean replaceMeta(String name, V curVal, V newVal) { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ @Override public <T> T unwrap(Class<T> clazz) { if(clazz.isAssignableFrom(getClass())) return clazz.cast(this); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java index fe74a56..da04a7a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.query; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.direct.*; @@ -27,6 +26,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; +import javax.cache.Cache.*; import java.io.*; import java.nio.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java index a67fabe..b8e5cd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java @@ -31,6 +31,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.plugin.security.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.event.*; import java.util.*; import java.util.concurrent.locks.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java index f9eb301..78da8a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java @@ -18,22 +18,17 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; -import org.apache.ignite.internal.*; import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.event.*; import java.io.*; -import java.util.*; -import java.util.concurrent.*; import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.internal.processors.cache.GridCacheValueBytes.*; @@ -240,11 +235,6 @@ public class GridCacheContinuousQueryEntry<K, V> implements Entry<K, V>, GridCac } /** {@inheritDoc} */ - @Override public CacheProjection<K, V> projection() { - return impl.projection(); - } - - /** {@inheritDoc} */ @Override public K getKey() { return key; } @@ -267,418 +257,6 @@ public class GridCacheContinuousQueryEntry<K, V> implements Entry<K, V>, GridCac } /** {@inheritDoc} */ - @Nullable @Override public V peek() { - assert impl != null; - - return newVal; - } - - /** {@inheritDoc} */ - @Nullable @Override public V peek(@Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException { - assert impl != null; - - return impl.peek(modes); - } - - /** {@inheritDoc} */ - @Nullable @Override public V get() - throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(LOCAL); - - return null; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> getAsync() { - assert impl != null; - - ctx.denyOnFlag(LOCAL); - - return new GridFinishedFuture<>(ctx.kernalContext()); - } - - /** {@inheritDoc} */ - @Nullable @Override public V reload() throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return null; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> reloadAsync() { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext()); - } - - /** {@inheritDoc} */ - @Override public boolean isLocked() { - assert impl != null; - - return impl.isLocked(); - } - - /** {@inheritDoc} */ - @Override public boolean isLockedByThread() { - assert impl != null; - - return impl.isLockedByThread(); - } - - /** {@inheritDoc} */ - @Override public Object version() { - assert impl != null; - - return impl.version(); - } - - /** {@inheritDoc} */ - @Override public long expirationTime() { - assert impl != null; - - return impl.expirationTime(); - } - - /** {@inheritDoc} */ - @Override public long timeToLive() { - assert impl != null; - - return impl.timeToLive(); - } - - /** {@inheritDoc} */ - @Override public void timeToLive(long ttl) { - assert impl != null; - - impl.timeToLive(ttl); - } - - /** {@inheritDoc} */ - @Override public boolean primary() { - assert impl != null; - - return impl.primary(); - } - - /** {@inheritDoc} */ - @Override public boolean backup() { - assert impl != null; - - return impl.backup(); - } - - /** {@inheritDoc} */ - @Override public int partition() { - assert impl != null; - - return impl.partition(); - } - - /** {@inheritDoc} */ - @Nullable @Override public V set(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) - throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return null; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> setAsync(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext()); - } - - /** {@inheritDoc} */ - @Nullable @Override public V setIfAbsent(V val) throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return null; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> setIfAbsentAsync(V val) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext()); - } - - /** {@inheritDoc} */ - @Override public boolean setx(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) - throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> setxAsync(V val, - @Nullable IgnitePredicate<Entry<K, V>>... filter) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext(), false); - } - - /** {@inheritDoc} */ - @Override public boolean setxIfAbsent(@Nullable V val) throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> setxIfAbsentAsync(V val) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext(), false); - } - - /** {@inheritDoc} */ - @Nullable @Override public V replace(V val) throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return null; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> replaceAsync(V val) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext()); - } - - /** {@inheritDoc} */ - @Override public boolean replacex(V val) throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> replacexAsync(V val) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext(), false); - } - - /** {@inheritDoc} */ - @Override public boolean replace(V oldVal, V newVal) throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> replaceAsync(V oldVal, V newVal) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext(), false); - } - - /** {@inheritDoc} */ - @Nullable @Override public V remove(@Nullable IgnitePredicate<Entry<K, V>>... filter) - throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return null; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(@Nullable IgnitePredicate<Entry<K, V>>... filter) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext()); - } - - /** {@inheritDoc} */ - @Override public boolean removex(@Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(@Nullable IgnitePredicate<Entry<K, V>>... filter) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext(), false); - } - - /** {@inheritDoc} */ - @Override public boolean remove(V val) throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removeAsync(V val) { - assert impl != null; - - ctx.denyOnFlag(READ); - - return new GridFinishedFuture<>(ctx.kernalContext(), false); - } - - /** {@inheritDoc} */ - @Override public boolean evict() { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public boolean clear() { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public boolean compact() - throws IgniteCheckedException { - assert impl != null; - - ctx.denyOnFlag(READ); - - return false; - } - - /** {@inheritDoc} */ - @Override public boolean lock(long timeout, @Nullable IgnitePredicate<Entry<K, V>>... filter) - throws IgniteCheckedException { - assert impl != null; - - return impl.lock(timeout, filter); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<Entry<K, V>>... filter) { - assert impl != null; - - return impl.lockAsync(timeout, filter); - } - - /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { - assert impl != null; - - impl.unlock(filter); - } - - /** {@inheritDoc} */ - @Override public boolean isCached() { - assert impl != null; - - return impl.isCached(); - } - - /** {@inheritDoc} */ - @Override public int memorySize() throws IgniteCheckedException { - assert impl != null; - - return impl.memorySize(); - } - - /** {@inheritDoc} */ - @Nullable @Override public <V> V addMeta(String name, V val) { - assert impl != null; - - return impl.addMeta(name, val); - } - - /** {@inheritDoc} */ - @Nullable @Override public <V> V putMetaIfAbsent(String name, V val) { - assert impl != null; - - return impl.putMetaIfAbsent(name, val); - } - - /** {@inheritDoc} */ - @Nullable @Override public <V> V putMetaIfAbsent(String name, Callable<V> c) { - assert impl != null; - - return impl.putMetaIfAbsent(name, c); - } - - /** {@inheritDoc} */ - @Override public <V> V meta(String name) { - assert impl != null; - - return impl.meta(name); - } - - /** {@inheritDoc} */ - @Override public <V> V removeMeta(String name) { - assert impl != null; - - return impl.removeMeta(name); - } - - /** {@inheritDoc} */ - @Override public <V> boolean removeMeta(String name, V val) { - assert impl != null; - - return impl.removeMeta(name, val); - } - - /** {@inheritDoc} */ - @Override public <V> boolean replaceMeta(String name, V curVal, V newVal) { - assert impl != null; - - return impl.replaceMeta(name, curVal, newVal); - } - - /** {@inheritDoc} */ @Override public void prepare(GridDeploymentInfo depInfo) { this.depInfo = depInfo; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java index b1eaffb..e0e7bee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; @@ -31,6 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.event.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java index 7dff5ae..bac3382 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java @@ -18,10 +18,9 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; -import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.CacheEntryEvent; +import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -29,6 +28,7 @@ import org.apache.ignite.resources.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.configuration.*; import javax.cache.event.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index dd84c81..ff15e56 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.transactions; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.version.*; @@ -30,6 +29,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.io.*; @@ -888,7 +888,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, else { key = (K)in.readObject(); entryProcessorsCol = U.readCollection(in); - filters = U.readEntryFilterArray(in); + filters = GridCacheUtils.readEntryFilterArray(in); } cacheId = in.readInt(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/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 60c7616..8af6c9f 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 @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.transactions; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; @@ -38,6 +37,7 @@ import org.apache.ignite.portables.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/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 d2c70f0..fb8fdf6 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 @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.transactions; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.dr.*; @@ -26,6 +25,7 @@ import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.processor.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java index 71a4612..fdb736a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java @@ -391,15 +391,16 @@ public class GridGgfsDataManager extends GridGgfsManager { // Schedule block request BEFORE prefetch requests. final GridGgfsBlockKey key = blockKey(blockIdx, fileInfo); - if (log.isDebugEnabled()) { - Entry<GridGgfsBlockKey, byte[]> entry = dataCachePrj.entry(key); - - assert entry != null; - - if (!entry.primary() && !entry.backup()) - log.debug("Reading non-local data block [path=" + path + ", fileInfo=" + fileInfo + - ", blockIdx=" + blockIdx + ']'); - } +// TODO ignite-96 +// if (log.isDebugEnabled()) { +// Entry<GridGgfsBlockKey, byte[]> entry = dataCachePrj.entry(key); +// +// assert entry != null; +// +// if (!entry.primary() && !entry.backup()) +// log.debug("Reading non-local data block [path=" + path + ", fileInfo=" + fileInfo + +// ", blockIdx=" + blockIdx + ']'); +// } IgniteInternalFuture<byte[]> fut = dataCachePrj.getAsync(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index 8d024ee..33d1098 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.service; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; @@ -42,10 +41,10 @@ import org.apache.ignite.thread.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.util.*; import java.util.concurrent.*; -import static java.util.Map.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; @@ -676,7 +675,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { Collection<UUID> used = new HashSet<>(); // Avoid redundant moving of services. - for (Entry<UUID, Integer> e : oldAssigns.assigns().entrySet()) { + for (Map.Entry<UUID, Integer> e : oldAssigns.assigns().entrySet()) { // Do not assign services to left nodes. if (ctx.discovery().node(e.getKey()) == null) continue; @@ -693,12 +692,12 @@ public class GridServiceProcessor extends GridProcessorAdapter { } if (remainder > 0) { - List<Entry<UUID, Integer>> entries = new ArrayList<>(cnts.entrySet()); + List<Map.Entry<UUID, Integer>> entries = new ArrayList<>(cnts.entrySet()); // Randomize. Collections.shuffle(entries); - for (Entry<UUID, Integer> e : entries) { + for (Map.Entry<UUID, Integer> e : entries) { // Assign only the ones that have not been reused from previous assignments. if (!used.contains(e.getKey())) { if (e.getValue() < maxPerNodeCnt) { @@ -712,12 +711,12 @@ public class GridServiceProcessor extends GridProcessorAdapter { } } else { - List<Entry<UUID, Integer>> entries = new ArrayList<>(cnts.entrySet()); + List<Map.Entry<UUID, Integer>> entries = new ArrayList<>(cnts.entrySet()); // Randomize. Collections.shuffle(entries); - for (Entry<UUID, Integer> e : entries) { + for (Map.Entry<UUID, Integer> e : entries) { e.setValue(e.getValue() + 1); if (--remainder == 0) @@ -927,7 +926,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { final Collection<CacheContinuousQueryEntry<Object, Object>> deps) { depExe.submit(new BusyRunnable() { @Override public void run0() { - for (Entry<Object, Object> e : deps) { + for (Map.Entry<Object, Object> e : deps) { if (!(e.getKey() instanceof GridServiceDeploymentKey)) continue; @@ -1205,7 +1204,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { final Collection<CacheContinuousQueryEntry<Object, Object>> assignCol) { depExe.submit(new BusyRunnable() { @Override public void run0() { - for (Entry<Object, Object> e : assignCol) { + for (Map.Entry<Object, Object> e : assignCol) { if (!(e.getKey() instanceof GridServiceAssignmentsKey)) continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index b631be8..c531506 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.util; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.Entry; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -1314,31 +1313,6 @@ public abstract class IgniteUtils { } /** - * Reads array from input stream. - * - * @param in Input stream. - * @return Deserialized array. - * @throws IOException If failed. - * @throws ClassNotFoundException If class not found. - */ - @SuppressWarnings("unchecked") - @Nullable public static <K, V> IgnitePredicate<Entry<K, V>>[] readEntryFilterArray(ObjectInput in) - throws IOException, ClassNotFoundException { - int len = in.readInt(); - - IgnitePredicate<Entry<K, V>>[] arr = null; - - if (len > 0) { - arr = new IgnitePredicate[len]; - - for (int i = 0; i < len; i++) - arr[i] = (IgnitePredicate<Entry<K, V>>)in.readObject(); - } - - return arr; - } - - /** * * @param out Output. * @param col Set to write. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java index 09bb782..660e587 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.util.lang; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; @@ -31,11 +30,11 @@ import org.apache.ignite.lang.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.lang.reflect.*; import java.math.*; import java.util.*; -import java.util.Map.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; @@ -359,12 +358,7 @@ public class GridFunc { private static final IgniteClosure CACHE_ENTRY_VAL_GET = new IgniteClosure() { @SuppressWarnings({"unchecked"}) @Nullable @Override public Object apply(Object o) { - try { - return ((Entry)o).get(); - } - catch (IgniteCheckedException e) { - throw new GridClosureException(e); - } + return ((Entry)o).getValue(); } @Override public String toString() { @@ -376,7 +370,7 @@ public class GridFunc { private static final IgniteClosure CACHE_ENTRY_VAL_PEEK = new IgniteClosure() { @SuppressWarnings({"unchecked"}) @Nullable @Override public Object apply(Object o) { - return ((Entry<?, ?>)o).peek(); + return ((Entry<?, ?>)o).getValue(); } @Override public String toString() { @@ -388,12 +382,7 @@ public class GridFunc { private static final IgnitePredicate CACHE_ENTRY_HAS_GET_VAL = new IgnitePredicate() { @SuppressWarnings({"unchecked"}) @Override public boolean apply(Object o) { - try { - return ((Entry)o).get() != null; - } - catch (IgniteCheckedException e) { - throw new GridClosureException(e); - } + return ((Entry)o).getValue() != null; } @Override public String toString() { @@ -2176,7 +2165,7 @@ public class GridFunc { */ @SuppressWarnings({"unchecked"}) public static <K, V> Map<K, V> lose(Map<K, V> m, boolean cp, - @Nullable IgnitePredicate<? super Entry<K, V>>... p) { + @Nullable IgnitePredicate<? super Map.Entry<K, V>>... p) { A.notNull(m, "m"); Map<K, V> res; @@ -2216,8 +2205,11 @@ public class GridFunc { * @param <V> Type of map's values. * @return Filtered map. */ - public static <K, V> Map<K, V> loseKeys(Map<K, V> m, boolean cp, - @Nullable final IgnitePredicate<? super K>... p) { + public static <K, V> Map<K, V> loseKeys( + Map<K, V> m, + boolean cp, + @Nullable final IgnitePredicate<? super K>... p + ) { return lose(m, cp, new P1<Map.Entry<K, V>>() { @Override public boolean apply(Map.Entry<K, V> e) { return isAll(e.getKey(), p); @@ -2656,7 +2648,7 @@ public class GridFunc { * @return Filtered map. */ public static <K, V> Map<K, V> retain(Map<K, V> m, boolean cp, - @Nullable IgnitePredicate<? super Entry<K, V>>... p) { + @Nullable IgnitePredicate<? super Map.Entry<K, V>>... p) { return lose(m, cp, F.not(p)); } @@ -6525,7 +6517,7 @@ public class GridFunc { * evaluate to {@code true} - otherwise returns {@code false}. */ public static <K1, K extends K1, V1, V extends V1> boolean exist(Map<K, V> m, - @Nullable IgnitePredicate<? super Entry<K, V>>... p) { + @Nullable IgnitePredicate<? super Map.Entry<K, V>>... p) { A.notNull(m, "m"); if (isAlwaysFalse(p)) @@ -6554,7 +6546,7 @@ public class GridFunc { * entries. Returns {@code false} otherwise. */ public static <K1, K extends K1, V1, V extends V1> boolean forAll(Map<K, V> m, - @Nullable IgnitePredicate<? super Entry<K, V>>... p) { + @Nullable IgnitePredicate<? super Map.Entry<K, V>>... p) { A.notNull(m, "m"); if (isAlwaysFalse(p)) @@ -6633,7 +6625,7 @@ public class GridFunc { * least one entry. Returns {@code false} otherwise. */ public static <K1, K extends K1, V1, V extends V1> boolean forAny(Map<K, V> m, - @Nullable IgnitePredicate<? super Entry<K, V>>... p) { + @Nullable IgnitePredicate<? super Map.Entry<K, V>>... p) { A.notNull(m, "m"); if (isAlwaysFalse(p)) @@ -7386,7 +7378,7 @@ public class GridFunc { if (m1.size() != m2.size()) return false; - for (Entry<K, V> e : m1.entrySet()) { + for (Map.Entry<K, V> e : m1.entrySet()) { V v1 = e.getValue(); V v2 = m2.get(e.getKey()); @@ -7784,46 +7776,6 @@ public class GridFunc { } /** - * Gets predicate which returns {@code true} if entry expires on or before given time - * in milliseconds. - * - * @param msec Maximum expire time in milliseconds. - * @param <K> Cache key type. - * @param <V> Cache value type. - * @return Predicate which returns {@code true} if entry - * expires on or before given time. - */ - public static <K, V> IgnitePredicate<Entry<K, V>> cacheExpireBefore(final long msec) { - A.ensure(msec >= 0, "msec >= 0"); - - return new IgnitePredicate<Entry<K, V>>() { - @Override public boolean apply(Entry<K, V> e) { - return e.expirationTime() <= msec; - } - }; - } - - /** - * Gets predicate which returns {@code true} if entry expires on or after given time - * in milliseconds. - * - * @param msec Minimum expire time in milliseconds. - * @param <K> Cache key type. - * @param <V> Cache value type. - * @return Predicate which returns {@code true} if entry - * expires on or after given time. - */ - public static <K, V> IgnitePredicate<Entry<K, V>> cacheExpireAfter(final long msec) { - A.ensure(msec >= 0, "msec >= 0"); - - return new IgnitePredicate<Entry<K, V>>() { - @Override public boolean apply(Entry<K, V> e) { - return e.expirationTime() >= msec; - } - }; - } - - /** * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#get()} * method returns {@code non-null} value. * @@ -7928,16 +7880,11 @@ public class GridFunc { return isEmpty(vals) ? F.<Entry<K, V>>alwaysFalse() : new IgnitePredicate<Entry<K, V>>() { @Override public boolean apply(Entry<K, V> e) { - try { - V v = e.get(); + V v = e.getValue(); - assert vals != null; + assert vals != null; - return v != null && vals.contains(v); - } - catch (IgniteCheckedException e1) { - throw wrap(e1); - } + return v != null && vals.contains(v); } }; } @@ -8026,12 +7973,7 @@ public class GridFunc { @Override public boolean apply(Entry<K, V> e) { assert map != null; - try { - return eq(e.get(), map.get(e.getKey())); - } - catch (IgniteCheckedException ex) { - throw wrap(ex); - } + return eq(e.getValue(), map.get(e.getKey())); } }; } @@ -8053,7 +7995,7 @@ public class GridFunc { @Override public boolean apply(Entry<K, V> e) { assert map != null; - return eq(e.peek(), map.get(e.getKey())); + return eq(e.getValue(), map.get(e.getKey())); } }; } @@ -8077,22 +8019,17 @@ public class GridFunc { return isEmpty(entries) ? F.<Entry<K, V>>alwaysFalse() : new IgnitePredicate<Entry<K, V>>() { @Override public boolean apply(Entry<K, V> e) { - try { - K k = e.getKey(); - V v = e.get(); - - assert entries != null; + K k = e.getKey(); + V v = e.getValue(); - for (Map.Entry<K, V> entry : entries) { - if (k.equals(entry.getKey()) && v!= null && v.equals(entry.getValue())) - return true; - } + assert entries != null; - return false; - } - catch (IgniteCheckedException ex) { - throw wrap(ex); + for (Map.Entry<K, V> entry : entries) { + if (k.equals(entry.getKey()) && v!= null && v.equals(entry.getValue())) + return true; } + + return false; } }; } @@ -8115,7 +8052,7 @@ public class GridFunc { new IgnitePredicate<Entry<K, V>>() { @Override public boolean apply(Entry<K, V> e) { K k = e.getKey(); - V v = e.peek(); + V v = e.getValue(); assert entries != null; @@ -8202,14 +8139,9 @@ public class GridFunc { isAlwaysFalse(ps) ? F.<Entry<K, V>>alwaysFalse() : new IgnitePredicate<Entry<K, V>>() { @Override public boolean apply(Entry<K, V> e) { - try { - V v = e.get(); + V v = e.getValue(); - return v != null && F.isAll(v, ps); - } - catch (IgniteCheckedException ex) { - throw wrap(ex); - } + return v != null && F.isAll(v, ps); } }; } @@ -8228,7 +8160,7 @@ public class GridFunc { isAlwaysFalse(ps) ? F.<Entry<K, V>>alwaysFalse() : new IgnitePredicate<Entry<K, V>>() { @Override public boolean apply(Entry<K, V> e) { - V v = e.peek(); + V v = e.getValue(); return v != null && F.isAll(v, ps); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java index af07db2..98237ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java @@ -17,10 +17,11 @@ package org.apache.ignite.internal.util.typedef; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.lang.*; +import javax.cache.Cache.*; + /** * Defines {@code alias} for <tt>GridPredicate<Entry<K, V>></tt> by extending * {@link org.apache.ignite.lang.IgnitePredicate}. Since Java doesn't provide type aliases (like Scala, for example) we resort @@ -28,6 +29,5 @@ import org.apache.ignite.lang.*; * readability. For more information see {@link org.apache.ignite.lang.IgnitePredicate} and {@link org.apache.ignite.cache.Entry}. * @see org.apache.ignite.lang.IgnitePredicate * @see GridFunc - * @see org.apache.ignite.cache.Entry */ public interface PCE<K, V> extends IgnitePredicate<Entry<K, V>> { /* No-op. */ } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java index 43a5b8a..89dd8f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java @@ -29,6 +29,7 @@ import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.util.*; @@ -197,11 +198,12 @@ public class VisorCache implements Serializable { int cnt = 0; - while (it.hasNext() && cnt < sz) { - memSz += it.next().memorySize(); - - cnt++; - } +// TODO ignite-96 +// while (it.hasNext() && cnt < sz) { +// memSz += it.next().memorySize(); +// +// cnt++; +// } if (cnt > 0) memSz = (long)((double)memSz / cnt * size); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java index 60fe4b0..80772a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java @@ -18,11 +18,14 @@ package org.apache.ignite.internal.visor.cache; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cluster.*; import org.apache.ignite.internal.processors.task.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.visor.*; import org.apache.ignite.lang.*; +import javax.cache.Cache.*; import java.util.*; /** @@ -60,9 +63,11 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map /** {@inheritDoc} */ @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) { Map<String, IgniteBiTuple<Integer, Integer>> total = new HashMap<>(); + ClusterNode locNode = g.localNode(); for (GridCache c: g.cachesx()) { String cacheName = c.name(); + CacheAffinity<Object> aff = g.affinity(c.name()); if (names.contains(cacheName)) { Set<Entry> entries = c.entrySet(); @@ -70,7 +75,7 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map int before = entries.size(), after = before; for (Entry entry: entries) { - if (entry.backup() && entry.evict()) + if (aff.isBackup(locNode, entry.getKey()) && c.evict(entry.getKey())) after--; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java index 7419203..2fcf7f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java @@ -18,7 +18,6 @@ package org.apache.ignite.lang; import org.apache.ignite.*; -import org.jetbrains.annotations.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6a57ab0/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java index 0911283..fca5325 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java @@ -2716,28 +2716,6 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ - public void testCacheExpire() throws Exception { - Ignite g = startGrid(1); - - try { - GridCache<String, String> cache = g.cache(null); - - cache.put("k1", "v1"); - cache.put("k2", "v2"); - - assert cache.forAll(F.<String, String>cacheExpireBefore(Long.MAX_VALUE)); - assert !cache.forAll(F.<String, String>cacheExpireAfter(Long.MAX_VALUE)); - } - finally { - stopGrid(1); - } - } - - /** - * JUnit. - * - * @throws Exception If failed. - */ public void testCacheContainsGet() throws Exception { Ignite g = startGrid(1);
