IGNITE-52 - Merge branch sprint-1 into ignite-52
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fce74d45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fce74d45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fce74d45 Branch: refs/heads/sprint-1 Commit: fce74d45b2a9c466f9767e64a07dea7105aabee3 Parents: b5b6c3e Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Feb 12 12:07:44 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Feb 12 12:07:44 2015 -0800 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheMapEntry.java | 13 ++++++++----- .../distributed/dht/atomic/GridDhtAtomicCache.java | 3 --- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fce74d45/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 9c83852..e95e5b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -633,7 +633,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> Object transformClo, String taskName, @Nullable IgniteCacheExpiryPolicy expirePlc) - throws IgniteCheckedException, GridCacheEntryRemovedException, GridCacheFilterFailedException { + throws IgniteCheckedException, GridCacheEntryRemovedException { cctx.denyOnFlag(LOCAL); return innerGet0(tx, @@ -1358,7 +1358,10 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> GridCacheValueBytes oldBytes = valueBytesUnlocked(); - if (needVal && old == null && (cctx.readThrough() && (op == GridCacheOperation.TRANSFORM || cctx.loadPreviousValue()))) { + boolean readThrough = false; + + if (needVal && old == null && + (cctx.readThrough() && (op == GridCacheOperation.TRANSFORM || cctx.loadPreviousValue()))) { old = readThrough(null, key, false, subjId, taskName); long ttl = 0; @@ -1401,7 +1404,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> boolean pass = cctx.isAll(wrapFilterLocked(), filter); if (!pass) { - if (expiryPlc != null && !cctx.readThrough() && filter != cctx.noPeekArray() && hasValueUnlocked()) { + if (expiryPlc != null && !readThrough && filter != cctx.noPeekArray() && hasValueUnlocked()) { long ttl = CU.toTtl(expiryPlc.getExpiryForAccess()); if (ttl != CU.TTL_NOT_CHANGED) @@ -1440,7 +1443,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> } if (!entry.modified()) { - if (expiryPlc != null && !cctx.readThrough() && hasValueUnlocked()) { + if (expiryPlc != null && !readThrough && hasValueUnlocked()) { long newTtl = CU.toTtl(expiryPlc.getExpiryForAccess()); if (newTtl != CU.TTL_NOT_CHANGED) @@ -1899,7 +1902,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> expiryPlc.ttlUpdated(key, getOrMarshalKeyBytes(), version(), - hasReaders() ? ((GridDhtCacheEntry)this).readers() : null); + hasReaders() ? ((GridDhtCacheEntry<K, V>)this).readers() : null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fce74d45/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 6b4cf8b..c089689 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 @@ -1504,9 +1504,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { catch (IgniteCheckedException e) { res.addFailedKey(entry.key(), e); } - catch (GridCacheFilterFailedException ignore) { - assert false : "Filter should never fail with failFast=false and empty filter."; - } } // Store final batch.
